Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-119

src/keyboard.c (adjust_point_for_property): #ifdef-out dodgy xassert

diff --git a/src/ChangeLog b/src/ChangeLog
index 0a079500925b9160b319a82a859e0ce9151296f5..8b5944a18661e307ac442a2de4d86fcb75008d05 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2004-02-28  Miles Bader  <miles@gnu.org>
+
+       * keyboard.c (adjust_point_for_property): #ifdef-out dodgy xassert.
+
 2004-02-28  Kim F. Storm  <storm@cua.dk>
 
        * keyboard.c (kbd_buffer_store_event_hold): New function to store

diff --git a/src/keyboard.c b/src/keyboard.c
index 7037ee93afd993062cc58ddd6ccc7f4f13dc26c1..3e58a2a75a864f2c991f3885c5c1ea414743f85a 100644 (file)
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -1928,7 +1928,12 @@ adjust_point_for_property (last_pt, modified)
                      : (PT < last_pt ? beg : end));
              check_composition = check_display = 1;
            }
+#if 0 /* This assertion isn't correct, because SET_PT may end up setting
+        the point to something other than its argument, due to
+        point-motion hooks, intangibility, etc.  */
          xassert (PT == beg || PT == end);
+#endif
+
          /* Pretend the area doesn't exist if the buffer is not
             modified.  */
          if (!modified && !ellipsis && beg < end)