From: Kim F. Storm <storm@cua.dk>
Date: Tue, 18 Jul 2006 13:25:40 +0000 (+0000)
Subject: (buffer_memory_full, memory_full): Use xsignal. Remove loop.
X-Git-Tag: emacs-pretest-22.0.90~1381
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=9b306d3759bc16bdede5feb832a4f8fe785b8827;p=emacs.git

(buffer_memory_full, memory_full): Use xsignal. Remove loop.
(list1): New function.
---

diff --git a/src/alloc.c b/src/alloc.c
index 1d3dc10c411..4b3fa4d7e69 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -559,8 +559,7 @@ buffer_memory_full ()
 
   /* This used to call error, but if we've run out of memory, we could
      get infinite recursion trying to build the string.  */
-  while (1)
-    Fsignal (Qnil, Vmemory_signal_data);
+  xsignal (Qnil, Vmemory_signal_data);
 }
 
 
@@ -2777,7 +2776,14 @@ check_cons_list ()
 #endif
 }
 
-/* Make a list of 2, 3, 4 or 5 specified objects.  */
+/* Make a list of 1, 2, 3, 4 or 5 specified objects.  */
+
+Lisp_Object
+list1 (arg1)
+     Lisp_Object arg1;
+{
+  return Fcons (arg1, Qnil);
+}
 
 Lisp_Object
 list2 (arg1, arg2)
@@ -3493,8 +3499,7 @@ memory_full ()
 
   /* This used to call error, but if we've run out of memory, we could
      get infinite recursion trying to build the string.  */
-  while (1)
-    Fsignal (Qnil, Vmemory_signal_data);
+  xsignal (Qnil, Vmemory_signal_data);
 }
 
 /* If we released our reserve (due to running out of memory),