aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMiles Bader2004-02-28 01:53:35 +0000
committerMiles Bader2004-02-28 01:53:35 +0000
commita874691c6cd8d74d0b51fae607b74543f1ffa1ca (patch)
tree8a8beb878636a4aac4d9bbadab444e98bc02f7da /src
parentec03e8b30a8e70eb0d344590e496abccb3f97994 (diff)
downloademacs-a874691c6cd8d74d0b51fae607b74543f1ffa1ca.tar.gz
emacs-a874691c6cd8d74d0b51fae607b74543f1ffa1ca.zip
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-119
src/keyboard.c (adjust_point_for_property): #ifdef-out dodgy xassert
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog4
-rw-r--r--src/keyboard.c5
2 files changed, 9 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 0a079500925..8b5944a1866 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
12004-02-28 Miles Bader <miles@gnu.org>
2
3 * keyboard.c (adjust_point_for_property): #ifdef-out dodgy xassert.
4
12004-02-28 Kim F. Storm <storm@cua.dk> 52004-02-28 Kim F. Storm <storm@cua.dk>
2 6
3 * keyboard.c (kbd_buffer_store_event_hold): New function to store 7 * keyboard.c (kbd_buffer_store_event_hold): New function to store
diff --git a/src/keyboard.c b/src/keyboard.c
index 7037ee93afd..3e58a2a75a8 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -1928,7 +1928,12 @@ adjust_point_for_property (last_pt, modified)
1928 : (PT < last_pt ? beg : end)); 1928 : (PT < last_pt ? beg : end));
1929 check_composition = check_display = 1; 1929 check_composition = check_display = 1;
1930 } 1930 }
1931#if 0 /* This assertion isn't correct, because SET_PT may end up setting
1932 the point to something other than its argument, due to
1933 point-motion hooks, intangibility, etc. */
1931 xassert (PT == beg || PT == end); 1934 xassert (PT == beg || PT == end);
1935#endif
1936
1932 /* Pretend the area doesn't exist if the buffer is not 1937 /* Pretend the area doesn't exist if the buffer is not
1933 modified. */ 1938 modified. */
1934 if (!modified && !ellipsis && beg < end) 1939 if (!modified && !ellipsis && beg < end)