diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2013-11-25 10:42:06 -0500 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2013-11-25 10:42:06 -0500 |
| commit | a5fa8eb4848e64455cf1aa47198285f9fa8baca0 (patch) | |
| tree | 33bbbf9fed5fb1301488f1c0c29c7469146ab08e /src | |
| parent | 5f5b128d48afce520ddb675849224977ea253294 (diff) | |
| download | emacs-a5fa8eb4848e64455cf1aa47198285f9fa8baca0.tar.gz | |
* src/textprop.c (text_property_stickiness): Fix front-stickiness at BOB.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 2 | ||||
| -rw-r--r-- | src/textprop.c | 8 |
2 files changed, 6 insertions, 4 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 9947ba4b070..123feaffae0 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,7 @@ 2013-11-25 Stefan Monnier <monnier@iro.umontreal.ca> + * textprop.c (text_property_stickiness): Fix front-stickiness at BOB. + * frame.c (Fhandle_focus_in, Fhandle_focus_out): Move to frame.el. (syms_of_frame): Don't defsubr them. diff --git a/src/textprop.c b/src/textprop.c index b804f345047..6a750f1361f 100644 --- a/src/textprop.c +++ b/src/textprop.c @@ -1820,7 +1820,7 @@ int text_property_stickiness (Lisp_Object prop, Lisp_Object pos, Lisp_Object buffer) { Lisp_Object prev_pos, front_sticky; - bool is_rear_sticky = 1, is_front_sticky = 0; /* defaults */ + bool is_rear_sticky = true, is_front_sticky = false; /* defaults */ Lisp_Object defalt = Fassq (prop, Vtext_property_default_nonsticky); if (NILP (buffer)) @@ -1841,10 +1841,10 @@ text_property_stickiness (Lisp_Object prop, Lisp_Object pos, Lisp_Object buffer) ? Fmemq (prop, rear_non_sticky) : rear_non_sticky)) /* PROP is rear-non-sticky. */ - is_rear_sticky = 0; + is_rear_sticky = false; } else - return 0; + is_rear_sticky = false; /* Consider following character. */ /* This signals an arg-out-of-range error if pos is outside the @@ -1855,7 +1855,7 @@ text_property_stickiness (Lisp_Object prop, Lisp_Object pos, Lisp_Object buffer) || (CONSP (front_sticky) && !NILP (Fmemq (prop, front_sticky)))) /* PROP is inherited from after. */ - is_front_sticky = 1; + is_front_sticky = true; /* Simple cases, where the properties are consistent. */ if (is_rear_sticky && !is_front_sticky) |