diff lisp/international/mule-cmds.el @ 43252:bccb026d40e4

2002-02-12 Per Abrahamsen <[e-mail]> * 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.

--- 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"