From: Chong Yidong <cyd@stupidchicken.com>
Date: Thu, 16 Apr 2009 03:58:44 +0000 (+0000)
Subject: * keyboard.c (adjust_point_for_property): Disable 2009-02-12
X-Git-Tag: emacs-pretest-23.0.93~113
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=0a0e7d497361df7a6c8ad3437847e4e6fc8130fd;p=emacs.git

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

diff --git a/src/ChangeLog b/src/ChangeLog
index 8758ae7d10f..60fd0530617 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2009-04-16  Chong Yidong  <cyd@stupidchicken.com>
+
+	* keyboard.c (adjust_point_for_property): Disable 2009-02-12
+	change (Bug#3003).
+
 2009-04-16  Kenichi Handa  <handa@m17n.org>
 
 	* xfont.c (xfont_has_char): Special handling of `ja' and `ko'
diff --git a/src/keyboard.c b/src/keyboard.c
index 527a82b55ff..56506571c2a 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -2048,20 +2048,20 @@ adjust_point_for_property (last_pt, modified)
 
 	  /* 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 @@ adjust_point_for_property (last_pt, modified)
 	      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)))