*** empty log message ***

src/alloc.c

@@ -24,12 +24,9 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #ifndef standalone
 #include "buffer.h"
 #include "window.h"
-#ifdef HAVE_X_WINDOWS
-#include "xterm.h"
 #ifdef MULTI_SCREEN
 #include "screen.h"
 #endif	/* MULTI_SCREEN */
-#endif	/* HAVE_X_WINDOWS */
 #endif
 
 #define max(A,B) ((A) > (B) ? (A) : (B))
@@ -753,7 +750,7 @@ make_uninit_string (length)
    arguments, are allowed.  */
 
 Lisp_Object
-make_sequence (nargs, args)
+make_array (nargs, args)
      register int nargs;
      Lisp_Object *args;
 {
@@ -1042,8 +1039,6 @@ Garbage collection happens automatically if you cons more than\n\
   char stack_top_variable;
   register int i;
 
-  BLOCK_INPUT;
-
   /* Save a copy of the contents of the stack, for debugging.  */
 #if MAX_SAVE_STACK > 0
   if (NULL (Vpurify_flag))
@@ -1181,10 +1176,6 @@ Garbage collection happens automatically if you cons more than\n\
   else if (!noninteractive)
     message1 ("Garbage collecting...done");
 
-#ifdef HAVE_X_WINDOWS
-  UNBLOCK_INPUT;
-#endif
-
   return Fcons (Fcons (make_number (total_conses),
 		       make_number (total_free_conses)),
 		Fcons (Fcons (make_number (total_symbols),

src/macros.c

@@ -106,8 +106,8 @@ An argument of zero means repeat until error.")
     {
       defining_kbd_macro = 0;
       update_mode_lines++;
-      Vlast_kbd_macro = make_sequence (kbd_macro_end - kbd_macro_buffer,
-				       kbd_macro_buffer);
+      Vlast_kbd_macro = make_array (kbd_macro_end - kbd_macro_buffer,
+				    kbd_macro_buffer);
       message("Keyboard macro defined");
     }