[Emacs-diffs] Changes to emacs/lisp/international/mule-cmds.el

[Per Abrahamsen]

Index: emacs/lisp/international/mule-cmds.el
diff -c emacs/lisp/international/mule-cmds.el:1.183 
emacs/lisp/international/mule-cmds.el:1.184
*** emacs/lisp/international/mule-cmds.el:1.183 Fri Feb  8 06:59:42 2002
--- emacs/lisp/international/mule-cmds.el       Tue Feb 12 04:49:46 2002
***************
*** 1103,1109 ****
            (if default "Select input method (default %s): " "Select input 
method: ")
            default t))))
    (activate-input-method input-method)
!   (setq default-input-method input-method))
  
  (defun toggle-input-method (&optional arg)
    "Enable or disable multilingual text input method for the current buffer.
--- 1103,1112 ----
            (if default "Select input method (default %s): " "Select input 
method: ")
            default t))))
    (activate-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,1141 ****
              (if default "Input method (default %s): " "Input method: " )
              default t))
         default))
!       (or default-input-method
!         (setq default-input-method current-input-method)))))
  
  (defun describe-input-method (input-method)
    "Describe input method INPUT-METHOD."
--- 1137,1147 ----
              (if default "Input method (default %s): " "Input method: " )
              default t))
         default))
!       (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,1303 ****
             (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)
        (error "Bogus calling sequence"))))
  
  (defcustom current-language-environment "English"
--- 1303,1311 ----
             (or (not (eq last-command-event 'Default))
                 (setq last-command-event 'English))
             (setq language-name (symbol-name last-command-event)))
!       (prog1
!           (set-language-environment language-name)
!         (customize-mark-as-set 'current-language-environment))
        (error "Bogus calling sequence"))))
  
  (defcustom current-language-environment "English"