Mercurial > emacs
changeset 43252:bccb026d40e4
2002-02-12 Per Abrahamsen <abraham@dina.kvl.dk>
* 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.
| author | Per Abrahamsen <abraham@dina.kvl.dk> |
|---|---|
| date | Tue, 12 Feb 2002 09:49:46 +0000 |
| parents | 3c634255d649 |
| children | a0316e8e7bf0 |
| files | lisp/ChangeLog lisp/international/mule-cmds.el lisp/menu-bar.el |
| diffstat | 3 files changed, 26 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Tue Feb 12 08:40:40 2002 +0000 +++ b/lisp/ChangeLog Tue Feb 12 09:49:46 2002 +0000 @@ -1,3 +1,16 @@ +2002-02-12 Per Abrahamsen <abraham@dina.kvl.dk> + + * 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 <walters@verbum.org> * ibuffer.el (ibuffer-switch-format): Supply required argument for
--- a/lisp/international/mule-cmds.el Tue Feb 12 08:40:40 2002 +0000 +++ b/lisp/international/mule-cmds.el Tue Feb 12 09:49:46 2002 +0000 @@ -1103,7 +1103,10 @@ (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 @@ (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 @@ (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"
--- a/lisp/menu-bar.el Tue Feb 12 08:40:40 2002 +0000 +++ b/lisp/menu-bar.el Tue Feb 12 09:49:46 2002 +0000 @@ -569,6 +569,7 @@ 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 @@ (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))))