diff options
| author | Dan Nicolaescu | 2010-11-18 08:57:00 -0800 |
|---|---|---|
| committer | Dan Nicolaescu | 2010-11-18 08:57:00 -0800 |
| commit | 50c7742814aafd5a540f521d9662648ea2ac8f54 (patch) | |
| tree | 376bb95b9f4bb72719cd20f61f8faf55d5b0a1c6 /src | |
| parent | 654ef137a33c238befb60a27e0df1d3855fb025e (diff) | |
| download | emacs-50c7742814aafd5a540f521d9662648ea2ac8f54.tar.gz emacs-50c7742814aafd5a540f521d9662648ea2ac8f54.zip | |
Move declarations from .c files to .h files.
* src/process.c (timers_run):
* src/minibuf.c (quit_char):
* src/lread.c (read_emacs_mule_char):
* src/keyboard.c (minibuf_level, message_enable_multibyte)
(pending_malloc_warning):
* src/insdel.c (Vselect_active_regions, Vsaved_region_selection)
(Qonly): Remove declarations.
* src/lisp.h (pending_malloc_warning, Vsaved_region_selection)
(Vselect_active_regions):
* src/keyboard.h (timers_run): Add declarations.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 12 | ||||
| -rw-r--r-- | src/insdel.c | 5 | ||||
| -rw-r--r-- | src/keyboard.c | 8 | ||||
| -rw-r--r-- | src/keyboard.h | 4 | ||||
| -rw-r--r-- | src/lisp.h | 3 | ||||
| -rw-r--r-- | src/lread.c | 2 | ||||
| -rw-r--r-- | src/minibuf.c | 4 | ||||
| -rw-r--r-- | src/process.c | 4 |
8 files changed, 17 insertions, 25 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 8753246c92b..304176a40eb 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,5 +1,17 @@ | |||
| 1 | 2010-11-18 Dan Nicolaescu <dann@ics.uci.edu> | 1 | 2010-11-18 Dan Nicolaescu <dann@ics.uci.edu> |
| 2 | 2 | ||
| 3 | Move declarations from .c files to .h files. | ||
| 4 | * process.c (timers_run): | ||
| 5 | * minibuf.c (quit_char): | ||
| 6 | * lread.c (read_emacs_mule_char): | ||
| 7 | * keyboard.c (minibuf_level, message_enable_multibyte) | ||
| 8 | (pending_malloc_warning): | ||
| 9 | * insdel.c (Vselect_active_regions, Vsaved_region_selection) | ||
| 10 | (Qonly): Remove declarations. | ||
| 11 | * lisp.h (pending_malloc_warning, Vsaved_region_selection) | ||
| 12 | (Vselect_active_regions): | ||
| 13 | * keyboard.h (timers_run): Add declarations. | ||
| 14 | |||
| 3 | * strftime.c (my_strftime_gmtime_r, my_strftime_localtime_r) | 15 | * strftime.c (my_strftime_gmtime_r, my_strftime_localtime_r) |
| 4 | (tm_diff): Convert definitions to standard C. | 16 | (tm_diff): Convert definitions to standard C. |
| 5 | (extra_args_spec_iso): Remove, unused. | 17 | (extra_args_spec_iso): Remove, unused. |
diff --git a/src/insdel.c b/src/insdel.c index ff380ada192..b62889082fd 100644 --- a/src/insdel.c +++ b/src/insdel.c | |||
| @@ -73,9 +73,6 @@ Lisp_Object combine_after_change_list; | |||
| 73 | Lisp_Object combine_after_change_buffer; | 73 | Lisp_Object combine_after_change_buffer; |
| 74 | 74 | ||
| 75 | Lisp_Object Qinhibit_modification_hooks; | 75 | Lisp_Object Qinhibit_modification_hooks; |
| 76 | |||
| 77 | extern Lisp_Object Vselect_active_regions, Vsaved_region_selection, Qonly; | ||
| 78 | |||
| 79 | 76 | ||
| 80 | /* Check all markers in the current buffer, looking for something invalid. */ | 77 | /* Check all markers in the current buffer, looking for something invalid. */ |
| 81 | 78 | ||
| @@ -2395,5 +2392,3 @@ as well as hooks attached to text properties and overlays. */); | |||
| 2395 | defsubr (&Scombine_after_change_execute); | 2392 | defsubr (&Scombine_after_change_execute); |
| 2396 | } | 2393 | } |
| 2397 | 2394 | ||
| 2398 | /* arch-tag: 9b34b886-47d7-465e-a234-299af411b23d | ||
| 2399 | (do not change this comment) */ | ||
diff --git a/src/keyboard.c b/src/keyboard.c index 0a6831750de..ec5c24511c4 100644 --- a/src/keyboard.c +++ b/src/keyboard.c | |||
| @@ -144,10 +144,6 @@ int this_single_command_key_start; | |||
| 144 | static int before_command_key_count; | 144 | static int before_command_key_count; |
| 145 | static int before_command_echo_length; | 145 | static int before_command_echo_length; |
| 146 | 146 | ||
| 147 | extern int minbuf_level; | ||
| 148 | |||
| 149 | extern int message_enable_multibyte; | ||
| 150 | |||
| 151 | /* If non-nil, the function that implements the display of help. | 147 | /* If non-nil, the function that implements the display of help. |
| 152 | It's called with one argument, the help string to display. */ | 148 | It's called with one argument, the help string to display. */ |
| 153 | 149 | ||
| @@ -431,8 +427,6 @@ FILE *dribble; | |||
| 431 | /* Nonzero if input is available. */ | 427 | /* Nonzero if input is available. */ |
| 432 | int input_pending; | 428 | int input_pending; |
| 433 | 429 | ||
| 434 | extern const char *pending_malloc_warning; | ||
| 435 | |||
| 436 | /* Circular buffer for pre-read keyboard input. */ | 430 | /* Circular buffer for pre-read keyboard input. */ |
| 437 | 431 | ||
| 438 | static struct input_event kbd_buffer[KBD_BUFFER_SIZE]; | 432 | static struct input_event kbd_buffer[KBD_BUFFER_SIZE]; |
| @@ -12434,5 +12428,3 @@ mark_kboards (void) | |||
| 12434 | } | 12428 | } |
| 12435 | } | 12429 | } |
| 12436 | 12430 | ||
| 12437 | /* arch-tag: 774e34d7-6d31-42f3-8397-e079a4e4c9ca | ||
| 12438 | (do not change this comment) */ | ||
diff --git a/src/keyboard.h b/src/keyboard.h index 9fd3b48eba9..7f36691a5a3 100644 --- a/src/keyboard.h +++ b/src/keyboard.h | |||
| @@ -490,6 +490,8 @@ extern unsigned long last_event_timestamp; | |||
| 490 | 490 | ||
| 491 | extern int quit_char; | 491 | extern int quit_char; |
| 492 | 492 | ||
| 493 | extern int timers_run; | ||
| 494 | |||
| 493 | extern int parse_menu_item (Lisp_Object, int); | 495 | extern int parse_menu_item (Lisp_Object, int); |
| 494 | 496 | ||
| 495 | extern void echo_now (void); | 497 | extern void echo_now (void); |
| @@ -534,5 +536,3 @@ extern int tty_read_avail_input (struct terminal *, int, | |||
| 534 | struct input_event *); | 536 | struct input_event *); |
| 535 | extern EMACS_TIME timer_check (int); | 537 | extern EMACS_TIME timer_check (int); |
| 536 | 538 | ||
| 537 | /* arch-tag: 769cbade-1ba9-4950-b886-db265b061aa3 | ||
| 538 | (do not change this comment) */ | ||
diff --git a/src/lisp.h b/src/lisp.h index 6c00aa28c46..8ddd7af79a8 100644 --- a/src/lisp.h +++ b/src/lisp.h | |||
| @@ -2736,6 +2736,7 @@ extern void memory_full (void) NO_RETURN; | |||
| 2736 | extern void buffer_memory_full (void) NO_RETURN; | 2736 | extern void buffer_memory_full (void) NO_RETURN; |
| 2737 | extern int survives_gc_p (Lisp_Object); | 2737 | extern int survives_gc_p (Lisp_Object); |
| 2738 | extern void mark_object (Lisp_Object); | 2738 | extern void mark_object (Lisp_Object); |
| 2739 | extern const char *pending_malloc_warning; | ||
| 2739 | extern Lisp_Object Vpurify_flag; | 2740 | extern Lisp_Object Vpurify_flag; |
| 2740 | extern Lisp_Object Vmemory_full; | 2741 | extern Lisp_Object Vmemory_full; |
| 2741 | extern Lisp_Object *stack_base; | 2742 | extern Lisp_Object *stack_base; |
| @@ -3233,6 +3234,8 @@ extern Lisp_Object Qdisabled, QCfilter; | |||
| 3233 | extern Lisp_Object Qabove_handle, Qhandle, Qbelow_handle; | 3234 | extern Lisp_Object Qabove_handle, Qhandle, Qbelow_handle; |
| 3234 | extern Lisp_Object Qup, Qdown, Qbottom, Qend_scroll; | 3235 | extern Lisp_Object Qup, Qdown, Qbottom, Qend_scroll; |
| 3235 | extern Lisp_Object Qtop, Qratio; | 3236 | extern Lisp_Object Qtop, Qratio; |
| 3237 | extern Lisp_Object Vsaved_region_selection; | ||
| 3238 | extern Lisp_Object Vselect_active_regions; | ||
| 3236 | extern Lisp_Object Vtty_erase_char, Vhelp_form, Vtop_level; | 3239 | extern Lisp_Object Vtty_erase_char, Vhelp_form, Vtop_level; |
| 3237 | extern Lisp_Object Vthrow_on_input; | 3240 | extern Lisp_Object Vthrow_on_input; |
| 3238 | extern int input_pending; | 3241 | extern int input_pending; |
diff --git a/src/lread.c b/src/lread.c index 945808c6e5a..18d4ba8360e 100644 --- a/src/lread.c +++ b/src/lread.c | |||
| @@ -552,8 +552,6 @@ readbyte_from_string (int c, Lisp_Object readcharfun) | |||
| 552 | encoded in `emacs-mule' and the first byte is already read in | 552 | encoded in `emacs-mule' and the first byte is already read in |
| 553 | C. */ | 553 | C. */ |
| 554 | 554 | ||
| 555 | extern char emacs_mule_bytes[256]; | ||
| 556 | |||
| 557 | static int | 555 | static int |
| 558 | read_emacs_mule_char (int c, int (*readbyte) (int, Lisp_Object), Lisp_Object readcharfun) | 556 | read_emacs_mule_char (int c, int (*readbyte) (int, Lisp_Object), Lisp_Object readcharfun) |
| 559 | { | 557 | { |
diff --git a/src/minibuf.c b/src/minibuf.c index f3a24afc199..0f3def614f2 100644 --- a/src/minibuf.c +++ b/src/minibuf.c | |||
| @@ -36,8 +36,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 36 | #include "keymap.h" | 36 | #include "keymap.h" |
| 37 | #include "termhooks.h" | 37 | #include "termhooks.h" |
| 38 | 38 | ||
| 39 | extern int quit_char; | ||
| 40 | |||
| 41 | /* List of buffers for use as minibuffers. | 39 | /* List of buffers for use as minibuffers. |
| 42 | The first element of the list is used for the outermost minibuffer | 40 | The first element of the list is used for the outermost minibuffer |
| 43 | invocation, the next element is used for a recursive minibuffer | 41 | invocation, the next element is used for a recursive minibuffer |
| @@ -2242,5 +2240,3 @@ properties. */); | |||
| 2242 | defsubr (&Scompleting_read); | 2240 | defsubr (&Scompleting_read); |
| 2243 | } | 2241 | } |
| 2244 | 2242 | ||
| 2245 | /* arch-tag: 8f69b601-fba3-484c-a6dd-ceaee54a7a73 | ||
| 2246 | (do not change this comment) */ | ||
diff --git a/src/process.c b/src/process.c index c38b94a9cb1..f8ca0958dd1 100644 --- a/src/process.c +++ b/src/process.c | |||
| @@ -113,8 +113,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 113 | #include "nsterm.h" | 113 | #include "nsterm.h" |
| 114 | #endif | 114 | #endif |
| 115 | 115 | ||
| 116 | extern int timers_run; | ||
| 117 | |||
| 118 | Lisp_Object Qeuid, Qegid, Qcomm, Qstate, Qppid, Qpgrp, Qsess, Qttname, Qtpgid; | 116 | Lisp_Object Qeuid, Qegid, Qcomm, Qstate, Qppid, Qpgrp, Qsess, Qttname, Qtpgid; |
| 119 | Lisp_Object Qminflt, Qmajflt, Qcminflt, Qcmajflt, Qutime, Qstime, Qcstime; | 117 | Lisp_Object Qminflt, Qmajflt, Qcminflt, Qcmajflt, Qutime, Qstime, Qcstime; |
| 120 | Lisp_Object Qcutime, Qpri, Qnice, Qthcount, Qstart, Qvsize, Qrss, Qargs; | 118 | Lisp_Object Qcutime, Qpri, Qnice, Qthcount, Qstart, Qvsize, Qrss, Qargs; |
| @@ -7744,5 +7742,3 @@ The variable takes effect when `start-process' is called. */); | |||
| 7744 | defsubr (&Sprocess_attributes); | 7742 | defsubr (&Sprocess_attributes); |
| 7745 | } | 7743 | } |
| 7746 | 7744 | ||
| 7747 | /* arch-tag: 3706c011-7b9a-4117-bd4f-59e7f701a4c4 | ||
| 7748 | (do not change this comment) */ | ||