[Emacs-diffs] emacs/src ChangeLog keyboard.c

[Chong Yidong]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Chong Yidong <cyd>      09/04/16 03:58:46

Modified files:
        src            : ChangeLog keyboard.c 

Log message:
        * keyboard.c (adjust_point_for_property): Disable 2009-02-12
        change (Bug#3003).

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/src/ChangeLog?cvsroot=emacs&r1=1.7488&r2=1.7489
http://cvs.savannah.gnu.org/viewcvs/emacs/src/keyboard.c?cvsroot=emacs&r1=1.1000&r2=1.1001

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/src/ChangeLog,v
retrieving revision 1.7488
retrieving revision 1.7489
diff -u -b -r1.7488 -r1.7489
--- ChangeLog   16 Apr 2009 01:39:36 -0000      1.7488
+++ ChangeLog   16 Apr 2009 03:58:44 -0000      1.7489
@@ -1,3 +1,8 @@
+2009-04-16  Chong Yidong  <address@hidden>
+
+       * keyboard.c (adjust_point_for_property): Disable 2009-02-12
+       change (Bug#3003).
+
 2009-04-16  Kenichi Handa  <address@hidden>
 
        * xfont.c (xfont_has_char): Special handling of `ja' and `ko'

Index: keyboard.c
===================================================================
RCS file: /sources/emacs/emacs/src/keyboard.c,v
retrieving revision 1.1000
retrieving revision 1.1001
diff -u -b -r1.1000 -r1.1001
--- keyboard.c  27 Mar 2009 16:14:24 -0000      1.1000
+++ keyboard.c  16 Apr 2009 03:58:45 -0000      1.1001
@@ -2048,20 +2048,20 @@
 
          /* Find boundaries `beg' and `end' of the invisible area, if any.  */
          while (end < ZV
-                /* Stop if we find a spot between two runs of
-                   `invisible' where inserted text would be visible.
-                   This is important when we have two invisible
-                   boundaries that enclose an area: if the area is
-                   empty, we need this test in order to make it
-                   possible to place point in the middle rather than
-                   skip both boundaries.
-                   Note that this will stop anywhere in a non-sticky
-                   text-property, but I don't think there's much we
-                   can do about that.  */
+#if 0
+                /* FIXME: We should stop if we find a spot between
+                   two runs of `invisible' where inserted text would
+                   be visible.  This is important when we have two
+                   invisible boundaries that enclose an area: if the
+                   area is empty, we need this test in order to make
+                   it possible to place point in the middle rather
+                   than skip both boundaries.  However, this code
+                   also stops anywhere in a non-sticky text-property,
+                   which breaks (e.g.) Org mode.  */
                 && (val = get_pos_property (make_number (end),
                                             Qinvisible, Qnil),
                     TEXT_PROP_MEANS_INVISIBLE (val))
-                /* FIXME: write and then use get_pos_property_and_overlay.  */
+#endif
                 && !NILP (val = get_char_property_and_overlay
                           (make_number (end), Qinvisible, Qnil, &overlay))
                 && (inv = TEXT_PROP_MEANS_INVISIBLE (val)))
@@ -2075,9 +2075,11 @@
              end = NATNUMP (tmp) ? XFASTINT (tmp) : ZV;
            }
          while (beg > BEGV
+#if 0
                 && (val = get_pos_property (make_number (beg),
                                             Qinvisible, Qnil),
                     TEXT_PROP_MEANS_INVISIBLE (val))
+#endif
                 && !NILP (val = get_char_property_and_overlay
                           (make_number (beg - 1), Qinvisible, Qnil, &overlay))
                 && (inv = TEXT_PROP_MEANS_INVISIBLE (val)))