Changeset 3456

Timestamp:

09/14/04 07:28:47 (4 years ago)

Author:

miyoshi

Message:

(message_dolog_marker1): New static variable.
(message_dolog_marker2): Ditto.
(message_dolog_marker3): Ditto.
(message_dolog): Sync up with Emacs CVS HEAD.
(syms_of_xdisp): Initialize message_dolog_marker1,
message_dolog_marker2 and message_dolog_marker3.

Files:

• branches/2.1/src/ChangeLog.Meadow (modified) (1 diff)
• branches/2.1/src/xdisp.c (modified) (8 diffs)

branches/2.1/src/ChangeLog.Meadow

@@ +1 @@
+2004-09-14  MIYOSHI Masanori  <miyoshi@meadowy.org>
+
+        * xdisp.c (message_dolog_marker1): New static variable.
+        (message_dolog_marker2): Ditto.
+        (message_dolog_marker3): Ditto.
+        (message_dolog): Sync up with Emacs CVS HEAD.
+        (syms_of_xdisp): Initialize message_dolog_marker1,
+        message_dolog_marker2 and message_dolog_marker3.
+
-2004-09-06  MIYOSHI Masanori  <miyoshi@meadowy.org>
-

branches/2.1/src/xdisp.c

@@ -311 +311 @@
-static int message_log_need_newline;
-
+/* Three markers that message_dolog uses.
+   It could allocate them itself, but that causes trouble
+   in handling memory-full errors.  */
+static Lisp_Object message_dolog_marker1;
+static Lisp_Object message_dolog_marker2;
+static Lisp_Object message_dolog_marker3;
-
-/* The buffer position of the first character appearing entirely or
@@ -5730 +5736 @@
-      int zv_at_end = 0;
-      Lisp_Object old_deactivate_mark, tem;
-, gcpro2, gcpro3, gcpro4
+
-
-      old_deactivate_mark = Vdeactivate_mark;
@@ -5737 +5743 @@
-      current_buffer->undo_list = Qt;
-
-
-
-
-
+
+
+
+
+
+
+
-
-      if (PT == Z)
@@ -5760 +5769 @@
-          int i, c, char_bytes;
-          unsigned char work[1];
-
+
-          /* Convert a multibyte string to single-byte
-             for the *Message* buffer.  */
@@ -5799 +5808 @@
-          this_bol_byte = PT_BYTE;
-
+          /* See if this line duplicates the previous one.
+             If so, combine duplicates.  */
-          if (this_bol > BEG)
-            {
@@ -5826 +5837 @@
-            }
-
+          /* If we have more than the desired maximum number of lines
+             in the *Messages* buffer now, delete the oldest ones.
+             This is safe because we don't have undo in this buffer.  */
+
-          if (NATNUMP (Vmessage_log_max))
-            {
@@ -5855 +5870 @@
-                          XMARKER (oldpoint)->bytepos);
-
-      free_marker (oldpoint);
-      free_marker (oldbegv);
-      free_marker (oldzv);
-      UNGCPRO;
+      unchain_marker (oldpoint);
+      unchain_marker (oldbegv);
+      unchain_marker (oldzv);
-
-      tem = Fget_buffer_window (Fcurrent_buffer (), Qt);
@@ -14831 +14846 @@
-  Qinhibit_redisplay = intern ("inhibit-redisplay");
-  staticpro (&Qinhibit_redisplay);
+
+  message_dolog_marker1 = Fmake_marker ();
+  staticpro (&message_dolog_marker1);
+  message_dolog_marker2 = Fmake_marker ();
+  staticpro (&message_dolog_marker2);
+  message_dolog_marker3 = Fmake_marker ();
+  staticpro (&message_dolog_marker3);
-
-#if GLYPH_DEBUG