diff options
| author | Stefan Monnier | 2003-06-15 21:49:23 +0000 |
|---|---|---|
| committer | Stefan Monnier | 2003-06-15 21:49:23 +0000 |
| commit | 6793bc632203b11d4d869b9ab89e323f915a2944 (patch) | |
| tree | 240ed435957db05286fb4fa49519c6a2111e9257 /src | |
| parent | 1269a76123e137f23bfed176b58254f8d8bd9aeb (diff) | |
| download | emacs-6793bc632203b11d4d869b9ab89e323f915a2944.tar.gz emacs-6793bc632203b11d4d869b9ab89e323f915a2944.zip | |
(mark_kboards): Move to keyboard.c.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 30 | ||||
| -rw-r--r-- | src/alloc.c | 30 |
2 files changed, 26 insertions, 34 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index bd4ce39e3eb..08b9ec38928 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,7 +1,27 @@ | |||
| 1 | 2003-06-15 Stefan Monnier <monnier@cs.yale.edu> | ||
| 2 | |||
| 3 | * termhooks.h (EVENT_INIT): New macro. | ||
| 4 | |||
| 5 | * keyboard.c (mark_kboards): Move from alloc.c. Mark kbd_buffer. | ||
| 6 | |||
| 7 | * alloc.c (mark_kboards): Move to keyboard.c. | ||
| 8 | |||
| 9 | * keyboard.c (record_asynch_buffer_change, read_avail_input): | ||
| 10 | * xterm.c (x_dispatch_event): | ||
| 11 | * xmenu.c (find_and_call_menu_selection): | ||
| 12 | * xdisp.c (handle_tool_bar_click): | ||
| 13 | * w32menu.c (menubar_selection_callback): | ||
| 14 | * sysdep.c (kbd_input_ast, read_input_waiting): | ||
| 15 | * msdos.c (dos_rawgetc): | ||
| 16 | * macterm.c (mac_check_for_quit_char): | ||
| 17 | * macmenu.c (menubar_selection_callback): | ||
| 18 | * gtkutil.c (xg_tool_bar_callback): Don't pass uninitialized | ||
| 19 | data to kbd_buffer_store_event. | ||
| 20 | |||
| 1 | 2003-06-15 Kim F. Storm <storm@cua.dk> | 21 | 2003-06-15 Kim F. Storm <storm@cua.dk> |
| 2 | 22 | ||
| 3 | * xdisp.c (x_fix_overlapping_area): Always use area relative X | 23 | * xdisp.c (x_fix_overlapping_area): Always use area relative X |
| 4 | to fix redisplay problem with tall characters (such as ,AC(B). | 24 | to fix redisplay problem with tall characters (such as ,AC(B). |
| 5 | 25 | ||
| 6 | 2003-06-13 Kai Gro,A_(Bjohann <kai.grossjohann@gmx.net> | 26 | 2003-06-13 Kai Gro,A_(Bjohann <kai.grossjohann@gmx.net> |
| 7 | 27 | ||
| @@ -15,8 +35,8 @@ | |||
| 15 | 35 | ||
| 16 | * alloca.c (alloca): Declare arg as size_t. | 36 | * alloca.c (alloca): Declare arg as size_t. |
| 17 | 37 | ||
| 18 | * sysdep.c: Remove redundant include of unistd.h, stdlib.h. Use | 38 | * sysdep.c: Remove redundant include of unistd.h, stdlib.h. |
| 19 | HAVE_DECL_SYS_SIGLIST, not SYS_SIGLIST_DECLARED. | 39 | Use HAVE_DECL_SYS_SIGLIST, not SYS_SIGLIST_DECLARED. |
| 20 | 40 | ||
| 21 | 2003-06-11 Dave Love <fx@gnu.org> | 41 | 2003-06-11 Dave Love <fx@gnu.org> |
| 22 | 42 | ||
| @@ -55,8 +75,8 @@ | |||
| 55 | Changes to merge with gnulib version and be consistent with the | 75 | Changes to merge with gnulib version and be consistent with the |
| 56 | autoconf test: | 76 | autoconf test: |
| 57 | 77 | ||
| 58 | * getloadavg.c: Set NLIST_STRUCT from HAVE_NLIST_H. Use | 78 | * getloadavg.c: Set NLIST_STRUCT from HAVE_NLIST_H. |
| 59 | HAVE_STRUCT_NLIST_N_UN_N_NAME, not NLIST_NAME_UNION. | 79 | Use HAVE_STRUCT_NLIST_N_UN_N_NAME, not NLIST_NAME_UNION. |
| 60 | [HAVE_LOCALE_H]: Include locale.h. | 80 | [HAVE_LOCALE_H]: Include locale.h. |
| 61 | (getloadavg) [HAVE_SETLOCALE]: Run sscanf in C locale. | 81 | (getloadavg) [HAVE_SETLOCALE]: Run sscanf in C locale. |
| 62 | 82 | ||
diff --git a/src/alloc.c b/src/alloc.c index 391d63691c6..53513a722b9 100644 --- a/src/alloc.c +++ b/src/alloc.c | |||
| @@ -249,7 +249,7 @@ Lisp_Object Vgc_elapsed; /* accumulated elapsed time in GC */ | |||
| 249 | EMACS_INT gcs_done; /* accumulated GCs */ | 249 | EMACS_INT gcs_done; /* accumulated GCs */ |
| 250 | 250 | ||
| 251 | static void mark_buffer P_ ((Lisp_Object)); | 251 | static void mark_buffer P_ ((Lisp_Object)); |
| 252 | static void mark_kboards P_ ((void)); | 252 | extern void mark_kboards P_ ((void)); |
| 253 | static void gc_sweep P_ ((void)); | 253 | static void gc_sweep P_ ((void)); |
| 254 | static void mark_glyph_matrix P_ ((struct glyph_matrix *)); | 254 | static void mark_glyph_matrix P_ ((struct glyph_matrix *)); |
| 255 | static void mark_face_cache P_ ((struct face_cache *)); | 255 | static void mark_face_cache P_ ((struct face_cache *)); |
| @@ -4964,34 +4964,6 @@ mark_buffer (buf) | |||
| 4964 | } | 4964 | } |
| 4965 | 4965 | ||
| 4966 | 4966 | ||
| 4967 | /* Mark the pointers in the kboard objects. */ | ||
| 4968 | |||
| 4969 | static void | ||
| 4970 | mark_kboards () | ||
| 4971 | { | ||
| 4972 | KBOARD *kb; | ||
| 4973 | Lisp_Object *p; | ||
| 4974 | for (kb = all_kboards; kb; kb = kb->next_kboard) | ||
| 4975 | { | ||
| 4976 | if (kb->kbd_macro_buffer) | ||
| 4977 | for (p = kb->kbd_macro_buffer; p < kb->kbd_macro_ptr; p++) | ||
| 4978 | mark_object (p); | ||
| 4979 | mark_object (&kb->Voverriding_terminal_local_map); | ||
| 4980 | mark_object (&kb->Vlast_command); | ||
| 4981 | mark_object (&kb->Vreal_last_command); | ||
| 4982 | mark_object (&kb->Vprefix_arg); | ||
| 4983 | mark_object (&kb->Vlast_prefix_arg); | ||
| 4984 | mark_object (&kb->kbd_queue); | ||
| 4985 | mark_object (&kb->defining_kbd_macro); | ||
| 4986 | mark_object (&kb->Vlast_kbd_macro); | ||
| 4987 | mark_object (&kb->Vsystem_key_alist); | ||
| 4988 | mark_object (&kb->system_key_syms); | ||
| 4989 | mark_object (&kb->Vdefault_minibuffer_frame); | ||
| 4990 | mark_object (&kb->echo_string); | ||
| 4991 | } | ||
| 4992 | } | ||
| 4993 | |||
| 4994 | |||
| 4995 | /* Value is non-zero if OBJ will survive the current GC because it's | 4967 | /* Value is non-zero if OBJ will survive the current GC because it's |
| 4996 | either marked or does not need to be marked to survive. */ | 4968 | either marked or does not need to be marked to survive. */ |
| 4997 | 4969 | ||