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

[Richard M . Stallman]

Index: emacs/lisp/international/mule-cmds.el
diff -c emacs/lisp/international/mule-cmds.el:1.257 
emacs/lisp/international/mule-cmds.el:1.258
*** emacs/lisp/international/mule-cmds.el:1.257 Sat Jun 12 02:21:21 2004
--- emacs/lisp/international/mule-cmds.el       Thu Nov  4 10:10:35 2004
***************
*** 1368,1379 ****
              current-input-method-title nil)
        (force-mode-line-update)))))
  
! (defun set-input-method (input-method)
    "Select and activate input method INPUT-METHOD for the current buffer.
  This also sets the default input method to the one you specify.
  If INPUT-METHOD is nil, this function turns off the input method, and
  also causes you to be prompted for a name of an input method the next
  time you invoke \\[toggle-input-method].
  
  To deactivate the input method interactively, use \\[toggle-input-method].
  To deactivate it programmatically, use \\[inactivate-input-method]."
--- 1368,1381 ----
              current-input-method-title nil)
        (force-mode-line-update)))))
  
! (defun set-input-method (input-method &optional interactive)
    "Select and activate input method INPUT-METHOD for the current buffer.
  This also sets the default input method to the one you specify.
  If INPUT-METHOD is nil, this function turns off the input method, and
  also causes you to be prompted for a name of an input method the next
  time you invoke \\[toggle-input-method].
+ When called interactively, the optional arg INTERACTIVE is non-nil,
+ which marks the variable `default-input-method' as set for Custom buffers.
  
  To deactivate the input method interactively, use \\[toggle-input-method].
  To deactivate it programmatically, use \\[inactivate-input-method]."
***************
*** 1381,1394 ****
     (let* ((default (or (car input-method-history) default-input-method)))
       (list (read-input-method-name
            (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.
  Only one input method can be enabled at any time in a given buffer.
  
--- 1383,1397 ----
     (let* ((default (or (car input-method-history) default-input-method)))
       (list (read-input-method-name
            (if default "Select input method (default %s): " "Select input 
method: ")
!           default t)
!          t)))
    (activate-input-method input-method)
    (setq default-input-method input-method)
!   (when interactive
      (customize-mark-as-set 'default-input-method))
    default-input-method)
  
! (defun toggle-input-method (&optional arg interactive)
    "Enable or disable multilingual text input method for the current buffer.
  Only one input method can be enabled at any time in a given buffer.
  
***************
*** 1401,1409 ****
  
  With a prefix argument, read an input method name with the minibuffer
  and enable that one.  The default is the most recent input method specified
! \(not including the currently active input method, if any)."
  
!   (interactive "P")
    (if (and current-input-method (not arg))
        (inactivate-input-method)
      (let ((default (or (car input-method-history) default-input-method)))
--- 1404,1415 ----
  
  With a prefix argument, read an input method name with the minibuffer
  and enable that one.  The default is the most recent input method specified
! \(not including the currently active input method, if any).
  
! When called interactively, the optional arg INTERACTIVE is non-nil,
! which marks the variable `default-input-method' as set for Custom buffers."
! 
!   (interactive "P\np")
    (if (and current-input-method (not arg))
        (inactivate-input-method)
      (let ((default (or (car input-method-history) default-input-method)))
***************
*** 1420,1426 ****
        (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)
--- 1426,1432 ----
        (unless default-input-method
        (prog1
            (setq default-input-method current-input-method)
!         (when interactive
            (customize-mark-as-set 'default-input-method)))))))
  
  (defun describe-input-method (input-method)