From f49909700b5fd44a10e7983a89ad9a0710fdddf4 Mon Sep 17 00:00:00 2001 From: Per Abrahamsen Date: Tue, 12 Feb 2002 09:49:46 +0000 Subject: [PATCH] 2002-02-12 Per Abrahamsen * menu-bar.el (menu-bar-options-save): Only save `current-language-environment' and `default-input-method' when marked as customized. * international/mule-cmds.el (setup-specified-language-environment): Mark `current-language-environment' as customized. (set-input-method): Mark `default-input-method' as customized when called interactively. (toggle-input-method): Ditto. --- lisp/ChangeLog | 13 +++++++++++++ lisp/international/mule-cmds.el | 16 ++++++++++++---- lisp/menu-bar.el | 5 +---- 3 files changed, 26 insertions(+), 8 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 03a23d7bdc2..16d6cd9207a 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,16 @@ +2002-02-12 Per Abrahamsen + + * menu-bar.el (menu-bar-options-save): Only save + `current-language-environment' and `default-input-method' when + marked as customized. + + * international/mule-cmds.el + (setup-specified-language-environment): Mark + `current-language-environment' as customized. + (set-input-method): Mark + `default-input-method' as customized when called interactively. + (toggle-input-method): Ditto. + 2002-02-11 Colin Walters * ibuffer.el (ibuffer-switch-format): Supply required argument for diff --git a/lisp/international/mule-cmds.el b/lisp/international/mule-cmds.el index 918076672b8..37bcddfef4e 100644 --- a/lisp/international/mule-cmds.el +++ b/lisp/international/mule-cmds.el @@ -1103,7 +1103,10 @@ To deactivate it programmatically, use \\[inactivate-input-method]." (if default "Select input method (default %s): " "Select input method: ") default t)))) (activate-input-method input-method) - (setq default-input-method input-method)) + (setq default-input-method input-method) + (when (interactive-p) + (customize-mark-as-set 'default-input-method)) + default-input-method) (defun toggle-input-method (&optional arg) "Enable or disable multilingual text input method for the current buffer. @@ -1134,8 +1137,11 @@ and enable that one. The default is the most recent input method specified (if default "Input method (default %s): " "Input method: " ) default t)) default)) - (or default-input-method - (setq default-input-method current-input-method))))) + (unless default-input-method + (prog1 + (setq default-input-method current-input-method) + (when (interactive-p) + (customize-mark-as-set 'default-input-method))))))) (defun describe-input-method (input-method) "Describe input method INPUT-METHOD." @@ -1297,7 +1303,9 @@ This hook is mainly used for canceling the effect of (or (not (eq last-command-event 'Default)) (setq last-command-event 'English)) (setq language-name (symbol-name last-command-event))) - (set-language-environment language-name) + (prog1 + (set-language-environment language-name) + (customize-mark-as-set 'current-language-environment)) (error "Bogus calling sequence")))) (defcustom current-language-environment "English" diff --git a/lisp/menu-bar.el b/lisp/menu-bar.el index 4c8c2a5c2eb..5ae7de6b978 100644 --- a/lisp/menu-bar.el +++ b/lisp/menu-bar.el @@ -569,6 +569,7 @@ Do the same for the keys of the same name." case-fold-search truncate-lines show-paren-mode transient-mark-mode global-font-lock-mode display-time-mode auto-compression-mode + current-language-environment default-input-method ;; Saving `text-mode-hook' is somewhat questionable, ;; as we might get more than we bargain for, if ;; other code may has added hooks as well. @@ -579,10 +580,6 @@ Do the same for the keys of the same name." (and (get elt 'customized-value) (customize-mark-to-save elt) (setq need-save t))) - ;; These are set with other functions. - (dolist (elt '(current-language-environment default-input-method)) - (when (customize-mark-to-save elt) - (setq need-save t))) ;; Save if we changed anything. (when need-save (custom-save-all)))) -- 2.39.5