aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/international/mule-cmds.el
diff options
context:
space:
mode:
authorPer Abrahamsen <[email protected]>2002-02-12 09:49:46 +0000
committerPer Abrahamsen <[email protected]>2002-02-12 09:49:46 +0000
commitf49909700b5fd44a10e7983a89ad9a0710fdddf4 (patch)
tree2df4b88549316f3b1895c6f596a0070d75ee2852 /lisp/international/mule-cmds.el
parent371b58e7fe8c1893bff355abe93debf4ab70215a (diff)
2002-02-12 Per Abrahamsen <[email protected]>
* 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.
Diffstat (limited to 'lisp/international/mule-cmds.el')
-rw-r--r--lisp/international/mule-cmds.el16
1 files changed, 12 insertions, 4 deletions
diff --git a/lisp/international/mule-cmds.el b/lisp/international/mule-cmds.el
index 918076672b..37bcddfef4 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"