;;;###autoload
(defun isearch-toggle-specified-input-method ()
- "Select and toggle specified input method in interactive search."
+ "Select an input method and turn it on in interactive search."
(interactive)
- ;; Let the command `toggle-input-method' ask users to select input
- ;; method interactively.
- (setq default-input-method nil)
- (isearch-toggle-input-method))
+ (let ((overriding-terminal-local-map nil))
+ (toggle-input-method t))
+ (setq isearch-input-method-function input-method-function
+ isearch-input-method-local-p t)
+ (setq input-method-function nil)
+ (isearch-update))
;;;###autoload
(defun isearch-toggle-input-method ()
"Toggle input method in interactive search."
(interactive)
- (if isearch-multibyte-characters-flag
- (setq isearch-multibyte-characters-flag nil)
- (condition-case nil
- (progn
- (if (null default-input-method)
- (let ((overriding-terminal-local-map nil))
- ;; No input method has ever been selected. Select one
- ;; interactively now. This also sets
- ;; `default-input-method-title' to the title of the
- ;; selected input method.
- (toggle-input-method)
- ;; And, inactivate it for the moment.
- (toggle-input-method)))
- (setq isearch-multibyte-characters-flag t))
- (error (ding))))
+ (let ((overriding-terminal-local-map nil))
+ (toggle-input-method))
+ (setq isearch-input-method-function input-method-function
+ isearch-input-method-local-p t)
+ (setq input-method-function nil)
(isearch-update))
-(defun isearch-input-method-after-insert-chunk-function ()
- (funcall inactivate-current-input-method-function))
+(defvar isearch-minibuffer-local-map
+ (let ((map (make-keymap)))
+ (define-key map [t] 'isearch-minibuffer-non-self-insert)
+ (let ((i ?\ ))
+ (while (< i 256)
+ (define-key map (vector i) 'isearch-minibuffer-self-insert)
+ (setq i (1+ i))))
+ (let ((l (generic-character-list))
+ (table (nth 1 map)))
+ (while l
+ (set-char-table-default table (car l) 'isearch-minibuffer-self-insert)
+ (setq l (cdr l))))
+ (define-key map "\C-m" 'exit-minibuffer)
+ (define-key map [return] 'exit-minibuffer)
+ (define-key map "\C-g" 'exit-minibuffer)
+ map)
+ "Keymap of minibuffer to input multibyte characters while isearching.")
+
+(defun isearch-minibuffer-non-self-insert ()
+ (interactive)
+ (setq unread-command-events (cons last-command-event unread-command-events))
+ (exit-minibuffer))
+
+(defun isearch-minibuffer-self-insert ()
+ (interactive)
+ (let ((events (cons last-command-event unread-post-input-method-events)))
+ (catch 'isearch-tag
+ (while events
+ (let* ((event (car events))
+ (cmd (key-binding (vector event))))
+ (cond ((or (eq cmd 'isearch-printing-char)
+ (eq cmd 'isearch-minibuffer-self-insert))
+ (insert event)
+ (setq events (cdr events)))
+ ((eq cmd 'exit-minibuffer)
+ (setq events (cdr events))
+ (throw 'isearch-tag nil))
+ (t
+ (throw 'isearch-tag nil))))))
+ (setq unread-post-input-method-events events)
+ (exit-minibuffer)))
+;;;###autoload
(defun isearch-process-search-multibyte-characters (last-char)
- (let* ((overriding-terminal-local-map nil)
- ;; Let input method exit when a chunk is inserted.
- (input-method-after-insert-chunk-hook
- '(isearch-input-method-after-insert-chunk-function))
- (input-method-inactivate-hook '(exit-minibuffer))
- ;; Let input method work rather tersely.
- (input-method-tersely-flag t)
- str)
- (setq unread-command-events (cons last-char unread-command-events))
- (setq str (read-multilingual-string (concat (isearch-message-prefix)
- isearch-message)))
- (isearch-process-search-string str str)))
+ (if (eq this-command 'isearch-printing-char)
+ (let ((overriding-terminal-local-map nil)
+ ;; Let input method work rather tersely.
+ (input-method-verbose-flag nil)
+ (minibuffer-local-map isearch-minibuffer-local-map)
+ str)
+ (setq unread-command-events
+ (cons last-char unread-command-events))
+ (setq str (read-multilingual-string
+ (concat (isearch-message-prefix) isearch-message)
+ nil
+ current-input-method))
+ (if (and str (> (length str) 0))
+ (let ((unread-command-events nil))
+ (isearch-process-search-string str str))
+ (isearch-update)))
+ (isearch-process-search-char last-char)))
;;; isearch-x.el ends here