(record_delete): Make sure last_point_position_buffer is a buffer before

comparing pointers.

diff --git a/src/ChangeLog b/src/ChangeLog
index b1a2b6aca821f85efea572245e26f48eacee94f9..3a749f95627fab698ec28421b7756d2f4addf473 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,31 @@
 2000-08-08  Ken Raeburn  <raeburn@gnu.org>
 
+       * keyboard.c (syms_of_keyboard): Initialize
+       last_point_position_buffer.
+       * undo.c (record_delete): Make sure last_point_position_buffer is
+       a buffer before comparing pointers.
+
+       * coding.h (decode_coding_string): Declare.
+
+       * intervals.h (Fprevious_single_char_property_change): Declare.
+
+       * textprop.c (Fprevious_single_char_property_change): Don't do
+       arithmetic directly on lisp objects.
+
+       * editfns.c (find_field): Use EQ, not ==, to compare lisp
+       objects.
+
+       * keyboard.h (menu_item_eval_property): Declare.
+
+       * xdisp.c (message_dolog): Save and protect string "*Messages*" to
+       reuse as buffer name, instead of recreating (and discarding) every
+       time a message is logged.
+       (with_echo_area_buffer): Make callback arg A2 a lisp object.
+       (current_message_1, truncate_message_1, set_message_1,
+       display_echo_area_1, resize_mini_window_1): Signatures changed.
+       (current_message, truncate_echo_area, display_echo_area,
+       resize_echo_area_axactly): Changed calls.
+
        * coding.c (find_safe_codings): CHAR_TABLE_SET index must be a
        lisp object.
        (Ffind_coding_systems_region_internal): First argument to Fappend

diff --git a/src/undo.c b/src/undo.c
index c09da9cddb51ea0922702bfad5e85ada34e9bb13..49dc4453d119f06f9f5fa8785ed019464c2087b8 100644 (file)
--- a/src/undo.c
+++ b/src/undo.c
@@ -140,6 +140,8 @@ record_delete (beg, string)
      point wasn't at start of deleted range, record where it was.  */
   if (at_boundary
       && last_point_position != XFASTINT (sbeg)
+      /* If we're called from batch mode, this could be nil.  */
+      && BUFFERP (last_point_position_buffer)
       && current_buffer == XBUFFER (last_point_position_buffer))
     current_buffer->undo_list
       = Fcons (make_number (last_point_position), current_buffer->undo_list);