aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2012-04-08 17:58:00 -0700
committerGlenn Morris2012-04-08 17:58:00 -0700
commitfd06db5dd60c90395429883a8175a9883f39ee16 (patch)
treea8532ca7ad163527ed37056eadf8cf7674a733d2
parent23df914bc57014c86915cf6251bd0e18bff1021c (diff)
downloademacs-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
-rw-r--r--lisp/ChangeLog7
-rw-r--r--lisp/files.el5
-rw-r--r--lisp/international/mule-cmds.el4
-rw-r--r--src/ChangeLog6
-rw-r--r--src/buffer.c13
5 files changed, 14 insertions, 21 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b769d60402e..ca2812b4996 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
12012-04-09 Glenn Morris <rgm@gnu.org>
2
3 * international/mule-cmds.el (set-default-coding-systems):
4 * files.el (normal-mode):
5 Remove guarded calls to ucs-set-table-for-input. (Bug#9821)
6 This function was removed with ucs-tables.el in 2008.
7
12012-04-08 Eli Zaretskii <eliz@gnu.org> 82012-04-08 Eli Zaretskii <eliz@gnu.org>
2 9
3 * textmodes/ispell.el (ispell-check-version): For hunspell, set 10 * textmodes/ispell.el (ispell-check-version): For hunspell, set
diff --git a/lisp/files.el b/lisp/files.el
index 0673b4fe56b..e623bc66080 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -2205,10 +2205,7 @@ in that case, this function acts as if `enable-local-variables' were t."
2205 (boundp 'font-lock-keywords) 2205 (boundp 'font-lock-keywords)
2206 (eq (car font-lock-keywords) t)) 2206 (eq (car font-lock-keywords) t))
2207 (setq font-lock-keywords (cadr font-lock-keywords)) 2207 (setq font-lock-keywords (cadr font-lock-keywords))
2208 (font-lock-mode 1)) 2208 (font-lock-mode 1)))
2209
2210 (if (fboundp 'ucs-set-table-for-input) ; don't lose when building
2211 (ucs-set-table-for-input)))
2212 2209
2213(defcustom auto-mode-case-fold t 2210(defcustom auto-mode-case-fold t
2214 "Non-nil means to try second pass through `auto-mode-alist'. 2211 "Non-nil means to try second pass through `auto-mode-alist'.
diff --git a/lisp/international/mule-cmds.el b/lisp/international/mule-cmds.el
index debc328c551..6d609b67d63 100644
--- a/lisp/international/mule-cmds.el
+++ b/lisp/international/mule-cmds.el
@@ -353,10 +353,6 @@ This also sets the following values:
353 if CODING-SYSTEM is ASCII-compatible" 353 if CODING-SYSTEM is ASCII-compatible"
354 (check-coding-system coding-system) 354 (check-coding-system coding-system)
355 (setq-default buffer-file-coding-system coding-system) 355 (setq-default buffer-file-coding-system coding-system)
356 (if (fboundp 'ucs-set-table-for-input)
357 (dolist (buffer (buffer-list))
358 (or (local-variable-p 'buffer-file-coding-system buffer)
359 (ucs-set-table-for-input buffer))))
360 356
361 (if (eq system-type 'darwin) 357 (if (eq system-type 'darwin)
362 ;; The file-name coding system on Darwin systems is always utf-8. 358 ;; The file-name coding system on Darwin systems is always utf-8.
diff --git a/src/ChangeLog b/src/ChangeLog
index a4627cb847c..1109f31f9d8 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
12012-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
12012-04-08 Andreas Schwab <schwab@linux-m68k.org> 72012-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;
128Lisp_Object Qfirst_change_hook; 128Lisp_Object Qfirst_change_hook;
129Lisp_Object Qbefore_change_functions; 129Lisp_Object Qbefore_change_functions;
130Lisp_Object Qafter_change_functions; 130Lisp_Object Qafter_change_functions;
131static Lisp_Object Qucs_set_table_for_input;
132 131
133static Lisp_Object Qfundamental_mode, Qmode_class, Qpermanent_local; 132static Lisp_Object Qfundamental_mode, Qmode_class, Qpermanent_local;
134static Lisp_Object Qpermanent_local_hook; 133static 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,