Mercurial > emacs

comparison src/intervals.c @ 70619:f5917c21d187

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* intervals.c (set_point_both): Fix mixup before before and after in variable names. * editfns.c (Fline_beginning_position): Inhibit point-motion hooks while setting point temporarily.
author Chong Yidong <cyd@stupidchicken.com>
date Fri, 12 May 2006 17:39:39 +0000
parents 3bd95f4f2941
children 089c7a7af5c9
comparison
equal deleted inserted replaced
70618:29e84c94807d 70619:f5917c21d187
2194 || ! intervals_equal (fromprev, toprev))) 2194 || ! intervals_equal (fromprev, toprev)))
2195 { 2195 {
2196 Lisp_Object leave_after, leave_before, enter_after, enter_before; 2196 Lisp_Object leave_after, leave_before, enter_after, enter_before;
2197 2197
2198 if (fromprev) 2198 if (fromprev)
2199 leave_after = textget (fromprev->plist, Qpoint_left); 2199 leave_before = textget (fromprev->plist, Qpoint_left);
2200 else
2201 leave_before = Qnil;
2202
2203 if (from)
2204 leave_after = textget (from->plist, Qpoint_left);
2200 else 2205 else
2201 leave_after = Qnil; 2206 leave_after = Qnil;
2202 if (from) 2207
2203 leave_before = textget (from->plist, Qpoint_left); 2208 if (toprev)
2209 enter_before = textget (toprev->plist, Qpoint_entered);
2204 else 2210 else
2205 leave_before = Qnil; 2211 enter_before = Qnil;
2206 2212
2207 if (toprev) 2213 if (to)
2208 enter_after = textget (toprev->plist, Qpoint_entered); 2214 enter_after = textget (to->plist, Qpoint_entered);
2209 else 2215 else
2210 enter_after = Qnil; 2216 enter_after = Qnil;
2211 if (to)
2212 enter_before = textget (to->plist, Qpoint_entered);
2213 else
2214 enter_before = Qnil;
2215 2217
2216 if (! EQ (leave_before, enter_before) && !NILP (leave_before)) 2218 if (! EQ (leave_before, enter_before) && !NILP (leave_before))
2217 call2 (leave_before, make_number (old_position), 2219 call2 (leave_before, make_number (old_position),
2218 make_number (charpos)); 2220 make_number (charpos));
2219 if (! EQ (leave_after, enter_after) && !NILP (leave_after)) 2221 if (! EQ (leave_after, enter_after) && !NILP (leave_after))
2220 call2 (leave_after, make_number (old_position), 2222 call2 (leave_after, make_number (old_position),
2221 make_number (charpos)); 2223 make_number (charpos));
2222 2224
2223 if (! EQ (enter_before, leave_before) && !NILP (enter_before)) 2225 if (! EQ (enter_before, leave_before) && !NILP (enter_before))
2224 call2 (enter_before, make_number (old_position), 2226 call2 (enter_before, make_number (old_position),
2225 make_number (charpos)); 2227 make_number (charpos));
2226 if (! EQ (enter_after, leave_after) && !NILP (enter_after)) 2228 if (! EQ (enter_after, leave_after) && !NILP (enter_after))
2227 call2 (enter_after, make_number (old_position), 2229 call2 (enter_after, make_number (old_position),
2228 make_number (charpos)); 2230 make_number (charpos));
2229 } 2231 }
2230 } 2232 }
2231 2233
2232 /* Move point to POSITION, unless POSITION is inside an intangible 2234 /* Move point to POSITION, unless POSITION is inside an intangible
2233 segment that reaches all the way to point. */ 2235 segment that reaches all the way to point. */