diff lisp/international/mule-cmds.el @ 83224:7a0245dd1848

Merged in changes from CVS trunk. Patches applied: * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-653 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-654 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-655 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-656 Update from CVS: lisp/man.el (Man-xref-normal-file): Fix help-echo. * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-657 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-658 Merge from gnus--rel--5.10 * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-659 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-660 Merge from gnus--rel--5.10 * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-661 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-662 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-663 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-664 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-665 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-666 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-667 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-668 Merge from gnus--rel--5.10 * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-669 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-670 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-671 Update from CVS * [e-mail]--gnu-2004/gnus--rel--5.10--patch-64 Update from CVS * [e-mail]--gnu-2004/gnus--rel--5.10--patch-65 Update from CVS * [e-mail]--gnu-2004/gnus--rel--5.10--patch-66 Update from CVS * [e-mail]--gnu-2004/gnus--rel--5.10--patch-67 Update from CVS * [e-mail]--gnu-2004/gnus--rel--5.10--patch-68 Update from CVS git-archimport-id: [e-mail]--2004/emacs--multi-tty--0--patch-264

--- a/lisp/international/mule-cmds.el	Sun Oct 31 02:05:24 2004 +0000
+++ b/lisp/international/mule-cmds.el	Sat Nov 06 17:52:02 2004 +0000
@@ -1368,12 +1368,14 @@
 	      current-input-method-title nil)
 	(force-mode-line-update)))))
 
-(defun set-input-method (input-method)
+(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,14 +1383,15 @@
    (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))))
+	    default t)
+	   t)))
   (activate-input-method input-method)
   (setq default-input-method input-method)
-  (when (interactive-p)
+  (when interactive
     (customize-mark-as-set 'default-input-method))
   default-input-method)
 
-(defun toggle-input-method (&optional arg)
+(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,9 +1404,12 @@
 
 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)."
+\(not including the currently active input method, if any).
 
-  (interactive "P")
+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,7 +1426,7 @@
       (unless default-input-method
 	(prog1
 	    (setq default-input-method current-input-method)
-	  (when (interactive-p)
+	  (when interactive
 	    (customize-mark-as-set 'default-input-method)))))))
 
 (defun describe-input-method (input-method)