[Emacs-diffs] trunk r115228: * src/textprop.c (text_property_stickiness): Fix front-stickiness at BOB.

[Stefan Monnier]

------------------------------------------------------------
revno: 115228
revision-id: address@hidden
parent: address@hidden
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Mon 2013-11-25 10:42:06 -0500
message:
  * src/textprop.c (text_property_stickiness): Fix front-stickiness at BOB.
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/textprop.c                 textprop.c-20091113204419-o5vbwnq5f7feedwu-512

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2013-11-25 02:41:02 +0000
+++ b/src/ChangeLog     2013-11-25 15:42:06 +0000
@@ -1,5 +1,7 @@
 2013-11-25  Stefan Monnier  <address@hidden>
 
+       * 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.
 

=== modified file 'src/textprop.c'
--- a/src/textprop.c    2013-08-06 05:30:18 +0000
+++ b/src/textprop.c    2013-11-25 15:42:06 +0000
@@ -1820,7 +1820,7 @@
 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 @@
                 ? 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 @@
       || (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)