comparison lisp/international/mule-cmds.el @ 19748:06cbad2e806a

(read-input-method-name): Specify the input history properly. (select-input-method): Improve prompt.

19747:bed06df9cbc5

  (if default
      (setq prompt (format prompt default)))
  (let* ((completion-ignore-case t)
	 ;; This binding is necessary because input-method-history is
	 ;; buffer local.
	 (minibuffer-history input-method-history)
	 (input-method (completing-read prompt input-method-alist
					nil t nil nil default)))
    (if (> (length input-method) 0)
	input-method
      (if inhibit-null
	  (error "No valid input method is specified")))))

  (interactive
   (let* ((default (or (car input-method-history) default-input-method)))
     (if (not enable-multibyte-characters)
	 (error "Can't activate an input method while multibyte characters are disabled"))
     (list (read-input-method-name
	    (if default "Input method (default %s): " "Input method: ")
	    default t))))
  (activate-input-method input-method)
  (setq default-input-method input-method))

(defun toggle-input-method (&optional arg)

19748:06cbad2e806a

  (if default
      (setq prompt (format prompt default)))
  (let* ((completion-ignore-case t)
	 ;; This binding is necessary because input-method-history is
	 ;; buffer local.
	 (input-method (completing-read prompt input-method-alist
					nil t nil 'input-method-history
					default)))
    (if (> (length input-method) 0)
	input-method
      (if inhibit-null
	  (error "No valid input method is specified")))))

  (interactive
   (let* ((default (or (car input-method-history) default-input-method)))
     (if (not enable-multibyte-characters)
	 (error "Can't activate an input method while multibyte characters are disabled"))
     (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))

(defun toggle-input-method (&optional arg)