From: Glenn Morris Date: Mon, 9 Apr 2012 00:58:00 +0000 (-0700) Subject: Remove ucs-set-table-for-input dead code X-Git-Tag: emacs-24.2.90~471^2~375 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=fd06db5dd60c90395429883a8175a9883f39ee16;p=emacs.git 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 --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index b769d60402e..ca2812b4996 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,10 @@ +2012-04-09 Glenn Morris + + * international/mule-cmds.el (set-default-coding-systems): + * files.el (normal-mode): + Remove guarded calls to ucs-set-table-for-input. (Bug#9821) + This function was removed with ucs-tables.el in 2008. + 2012-04-08 Eli Zaretskii * 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." (boundp 'font-lock-keywords) (eq (car font-lock-keywords) t)) (setq font-lock-keywords (cadr font-lock-keywords)) - (font-lock-mode 1)) - - (if (fboundp 'ucs-set-table-for-input) ; don't lose when building - (ucs-set-table-for-input))) + (font-lock-mode 1))) (defcustom auto-mode-case-fold t "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: if CODING-SYSTEM is ASCII-compatible" (check-coding-system coding-system) (setq-default buffer-file-coding-system coding-system) - (if (fboundp 'ucs-set-table-for-input) - (dolist (buffer (buffer-list)) - (or (local-variable-p 'buffer-file-coding-system buffer) - (ucs-set-table-for-input buffer)))) (if (eq system-type 'darwin) ;; 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 @@ +2012-04-09 Glenn Morris + + * buffer.c (Qucs_set_table_for_input): Remove. (Bug#9821) + (Fget_buffer_create): Don't call Qucs_set_table_for_input. + (init_buffer_once, syms_of_buffer): Remove Qucs_set_table_for_input. + 2012-04-08 Andreas Schwab * 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; Lisp_Object Qfirst_change_hook; Lisp_Object Qbefore_change_functions; Lisp_Object Qafter_change_functions; -static Lisp_Object Qucs_set_table_for_input; static Lisp_Object Qfundamental_mode, Qmode_class, Qpermanent_local; static Lisp_Object Qpermanent_local_hook; @@ -402,13 +401,6 @@ even if it is dead. The return value is never nil. */) if (!NILP (Vrun_hooks)) call1 (Vrun_hooks, Qbuffer_list_update_hook); - /* An error in calling the function here (should someone redefine it) - can lead to infinite regress until you run out of stack. rms - says that's not worth protecting against. */ - if (!NILP (Ffboundp (Qucs_set_table_for_input))) - /* buffer is on buffer-alist, so no gcpro. */ - call1 (Qucs_set_table_for_input, buffer); - return buffer; } @@ -5043,8 +5035,6 @@ init_buffer_once (void) Qkill_buffer_hook = intern_c_string ("kill-buffer-hook"); Fput (Qkill_buffer_hook, Qpermanent_local, Qt); - Qucs_set_table_for_input = intern_c_string ("ucs-set-table-for-input"); - /* super-magic invisible buffer */ Vprin1_to_string_buffer = Fget_buffer_create (make_pure_c_string (" prin1")); Vbuffer_alist = Qnil; @@ -5200,9 +5190,6 @@ syms_of_buffer (void) DEFSYM (Qafter_change_functions, "after-change-functions"); DEFSYM (Qkill_buffer_query_functions, "kill-buffer-query-functions"); - /* The next one is initialized in init_buffer_once. */ - staticpro (&Qucs_set_table_for_input); - Fput (Qprotected_field, Qerror_conditions, pure_cons (Qprotected_field, pure_cons (Qerror, Qnil))); Fput (Qprotected_field, Qerror_message,