procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* src/textprop.c (text_property_stickiness): Fix front-stickiness at BOB.

Browse source
This commit is contained in:
Stefan Monnier 2013-11-25 10:42:06 -05:00
parent 5f5b128d48
commit a5fa8eb484
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/ChangeLog
View file

@ -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.

8
src/textprop.c
View file

@ -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)