aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/alloc.c11
-rw-r--r--src/macros.c4
2 files changed, 3 insertions, 12 deletions
diff --git a/src/alloc.c b/src/alloc.c
index 68e6acb141f..856ac104c9d 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -24,12 +24,9 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
24#ifndef standalone 24#ifndef standalone
25#include "buffer.h" 25#include "buffer.h"
26#include "window.h" 26#include "window.h"
27#ifdef HAVE_X_WINDOWS
28#include "xterm.h"
29#ifdef MULTI_SCREEN 27#ifdef MULTI_SCREEN
30#include "screen.h" 28#include "screen.h"
31#endif /* MULTI_SCREEN */ 29#endif /* MULTI_SCREEN */
32#endif /* HAVE_X_WINDOWS */
33#endif 30#endif
34 31
35#define max(A,B) ((A) > (B) ? (A) : (B)) 32#define max(A,B) ((A) > (B) ? (A) : (B))
@@ -753,7 +750,7 @@ make_uninit_string (length)
753 arguments, are allowed. */ 750 arguments, are allowed. */
754 751
755Lisp_Object 752Lisp_Object
756make_sequence (nargs, args) 753make_array (nargs, args)
757 register int nargs; 754 register int nargs;
758 Lisp_Object *args; 755 Lisp_Object *args;
759{ 756{
@@ -1042,8 +1039,6 @@ Garbage collection happens automatically if you cons more than\n\
1042 char stack_top_variable; 1039 char stack_top_variable;
1043 register int i; 1040 register int i;
1044 1041
1045 BLOCK_INPUT;
1046
1047 /* Save a copy of the contents of the stack, for debugging. */ 1042 /* Save a copy of the contents of the stack, for debugging. */
1048#if MAX_SAVE_STACK > 0 1043#if MAX_SAVE_STACK > 0
1049 if (NULL (Vpurify_flag)) 1044 if (NULL (Vpurify_flag))
@@ -1181,10 +1176,6 @@ Garbage collection happens automatically if you cons more than\n\
1181 else if (!noninteractive) 1176 else if (!noninteractive)
1182 message1 ("Garbage collecting...done"); 1177 message1 ("Garbage collecting...done");
1183 1178
1184#ifdef HAVE_X_WINDOWS
1185 UNBLOCK_INPUT;
1186#endif
1187
1188 return Fcons (Fcons (make_number (total_conses), 1179 return Fcons (Fcons (make_number (total_conses),
1189 make_number (total_free_conses)), 1180 make_number (total_free_conses)),
1190 Fcons (Fcons (make_number (total_symbols), 1181 Fcons (Fcons (make_number (total_symbols),
diff --git a/src/macros.c b/src/macros.c
index e28ae8c2bd8..5b19d926d66 100644
--- a/src/macros.c
+++ b/src/macros.c
@@ -106,8 +106,8 @@ An argument of zero means repeat until error.")
106 { 106 {
107 defining_kbd_macro = 0; 107 defining_kbd_macro = 0;
108 update_mode_lines++; 108 update_mode_lines++;
109 Vlast_kbd_macro = make_sequence (kbd_macro_end - kbd_macro_buffer, 109 Vlast_kbd_macro = make_array (kbd_macro_end - kbd_macro_buffer,
110 kbd_macro_buffer); 110 kbd_macro_buffer);
111 message("Keyboard macro defined"); 111 message("Keyboard macro defined");
112 } 112 }
113 113