diff options
| author | Glenn Morris | 2012-04-08 17:58:00 -0700 |
|---|---|---|
| committer | Glenn Morris | 2012-04-08 17:58:00 -0700 |
| commit | fd06db5dd60c90395429883a8175a9883f39ee16 (patch) | |
| tree | a8532ca7ad163527ed37056eadf8cf7674a733d2 /src | |
| parent | 23df914bc57014c86915cf6251bd0e18bff1021c (diff) | |
| download | emacs-fd06db5dd60c90395429883a8175a9883f39ee16.tar.gz emacs-fd06db5dd60c90395429883a8175a9883f39ee16.zip | |
Remove ucs-set-table-for-input dead code
This function was removed with ucs-tables.el in 2008.
* lisp/international/mule-cmds.el (set-default-coding-systems):
* lisp/files.el (normal-mode):
Remove guarded calls to ucs-set-table-for-input.
* src/buffer.c (Qucs_set_table_for_input): Remove.
(Fget_buffer_create): Don't call Qucs_set_table_for_input.
(init_buffer_once, syms_of_buffer): Remove Qucs_set_table_for_input.
Fixes: debbugs:9821
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 6 | ||||
| -rw-r--r-- | src/buffer.c | 13 |
2 files changed, 6 insertions, 13 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index a4627cb847c..1109f31f9d8 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,9 @@ | |||
| 1 | 2012-04-09 Glenn Morris <rgm@gnu.org> | ||
| 2 | |||
| 3 | * buffer.c (Qucs_set_table_for_input): Remove. (Bug#9821) | ||
| 4 | (Fget_buffer_create): Don't call Qucs_set_table_for_input. | ||
| 5 | (init_buffer_once, syms_of_buffer): Remove Qucs_set_table_for_input. | ||
| 6 | |||
| 1 | 2012-04-08 Andreas Schwab <schwab@linux-m68k.org> | 7 | 2012-04-08 Andreas Schwab <schwab@linux-m68k.org> |
| 2 | 8 | ||
| 3 | * lisp.h (struct Lisp_Symbol): Add explicit padding to ensure | 9 | * lisp.h (struct Lisp_Symbol): Add explicit padding to ensure |
diff --git a/src/buffer.c b/src/buffer.c index 1fea19b0d65..3f9b2744e96 100644 --- a/src/buffer.c +++ b/src/buffer.c | |||
| @@ -128,7 +128,6 @@ static Lisp_Object Qchange_major_mode_hook; | |||
| 128 | Lisp_Object Qfirst_change_hook; | 128 | Lisp_Object Qfirst_change_hook; |
| 129 | Lisp_Object Qbefore_change_functions; | 129 | Lisp_Object Qbefore_change_functions; |
| 130 | Lisp_Object Qafter_change_functions; | 130 | Lisp_Object Qafter_change_functions; |
| 131 | static Lisp_Object Qucs_set_table_for_input; | ||
| 132 | 131 | ||
| 133 | static Lisp_Object Qfundamental_mode, Qmode_class, Qpermanent_local; | 132 | static Lisp_Object Qfundamental_mode, Qmode_class, Qpermanent_local; |
| 134 | static Lisp_Object Qpermanent_local_hook; | 133 | static Lisp_Object Qpermanent_local_hook; |
| @@ -402,13 +401,6 @@ even if it is dead. The return value is never nil. */) | |||
| 402 | if (!NILP (Vrun_hooks)) | 401 | if (!NILP (Vrun_hooks)) |
| 403 | call1 (Vrun_hooks, Qbuffer_list_update_hook); | 402 | call1 (Vrun_hooks, Qbuffer_list_update_hook); |
| 404 | 403 | ||
| 405 | /* An error in calling the function here (should someone redefine it) | ||
| 406 | can lead to infinite regress until you run out of stack. rms | ||
| 407 | says that's not worth protecting against. */ | ||
| 408 | if (!NILP (Ffboundp (Qucs_set_table_for_input))) | ||
| 409 | /* buffer is on buffer-alist, so no gcpro. */ | ||
| 410 | call1 (Qucs_set_table_for_input, buffer); | ||
| 411 | |||
| 412 | return buffer; | 404 | return buffer; |
| 413 | } | 405 | } |
| 414 | 406 | ||
| @@ -5043,8 +5035,6 @@ init_buffer_once (void) | |||
| 5043 | Qkill_buffer_hook = intern_c_string ("kill-buffer-hook"); | 5035 | Qkill_buffer_hook = intern_c_string ("kill-buffer-hook"); |
| 5044 | Fput (Qkill_buffer_hook, Qpermanent_local, Qt); | 5036 | Fput (Qkill_buffer_hook, Qpermanent_local, Qt); |
| 5045 | 5037 | ||
| 5046 | Qucs_set_table_for_input = intern_c_string ("ucs-set-table-for-input"); | ||
| 5047 | |||
| 5048 | /* super-magic invisible buffer */ | 5038 | /* super-magic invisible buffer */ |
| 5049 | Vprin1_to_string_buffer = Fget_buffer_create (make_pure_c_string (" prin1")); | 5039 | Vprin1_to_string_buffer = Fget_buffer_create (make_pure_c_string (" prin1")); |
| 5050 | Vbuffer_alist = Qnil; | 5040 | Vbuffer_alist = Qnil; |
| @@ -5200,9 +5190,6 @@ syms_of_buffer (void) | |||
| 5200 | DEFSYM (Qafter_change_functions, "after-change-functions"); | 5190 | DEFSYM (Qafter_change_functions, "after-change-functions"); |
| 5201 | DEFSYM (Qkill_buffer_query_functions, "kill-buffer-query-functions"); | 5191 | DEFSYM (Qkill_buffer_query_functions, "kill-buffer-query-functions"); |
| 5202 | 5192 | ||
| 5203 | /* The next one is initialized in init_buffer_once. */ | ||
| 5204 | staticpro (&Qucs_set_table_for_input); | ||
| 5205 | |||
| 5206 | Fput (Qprotected_field, Qerror_conditions, | 5193 | Fput (Qprotected_field, Qerror_conditions, |
| 5207 | pure_cons (Qprotected_field, pure_cons (Qerror, Qnil))); | 5194 | pure_cons (Qprotected_field, pure_cons (Qerror, Qnil))); |
| 5208 | Fput (Qprotected_field, Qerror_message, | 5195 | Fput (Qprotected_field, Qerror_message, |