;;; isearch-x.el --- extended isearch handling commands
-;; Copyright (C) 1995 Electrotechnical Laboratory, JAPAN.
-;; Licensed to the Free Software Foundation.
+;; Copyright (C) 1997, 2001-2016 Free Software Foundation, Inc.
+;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+;; 2005, 2006, 2007, 2008, 2009, 2010, 2011
+;; National Institute of Advanced Industrial Science and Technology (AIST)
+;; Registration Number H14PRO021
-;; Keywords: multilingual, isearch
+;; Keywords: i18n, multilingual, isearch
;; Author: Kenichi HANDA <handa@etl.go.jp>
;; Maintainer: Kenichi HANDA <handa@etl.go.jp>
;; This file is part of GNU Emacs.
-;; GNU Emacs is free software; you can redistribute it and/or modify
+;; GNU Emacs is free software: you can redistribute it and/or modify
;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
;; GNU Emacs is distributed in the hope that it will be useful,
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
;; GNU General Public License for more details.
;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
+
+;;; Commentary:
;;; Code:
map)
"Keymap to use in minibuffer for multibyte character inputting in isearch.")
-
-;; These two variables are used to refer to the values of
-;; `current-input-method' and `input-method-function' of the original
-;; buffer in the function isearch-with-input-method which runs in a
-;; minibuffer.
-
-(defvar isearch-minibuffer-input-method nil)
-(defvar isearch-minibuffer-input-method-function nil)
-
;; Exit from recursive edit safely. Set in `after-change-functions'
;; by isearch-with-keyboard-coding.
-(defun isearch-exit-recursive-edit ()
+(defun isearch-exit-recursive-edit (start end length)
(interactive)
(throw 'exit nil))
(defun isearch-with-keyboard-coding ()
(interactive)
+ ;; FIXME: What does this after-change-functions binding do here?
(let ((after-change-functions '(isearch-exit-recursive-edit)))
(recursive-edit))
(exit-minibuffer))
(defun isearch-with-input-method ()
(interactive)
- (let* ((current-input-method isearch-minibuffer-input-method)
- (events (funcall isearch-minibuffer-input-method-function nil)))
+ (let ((key (car unread-command-events))
+ events)
+ (setq unread-command-events (cdr unread-command-events)
+ events (funcall input-method-function key))
;; EVENTS is a list of events the input method has generated. It
;; contains a character event and/or the special event
;; `compose-last-chars'. We extract only character events and
(exit-minibuffer)))
;;;###autoload
-(defun isearch-process-search-multibyte-characters (last-char)
+(defun isearch-process-search-multibyte-characters (last-char &optional count)
(if (eq this-command 'isearch-printing-char)
(let ((overriding-terminal-local-map nil)
- (prompt (concat (isearch-message-prefix) isearch-message))
+ (prompt (isearch-message-prefix))
(minibuffer-local-map isearch-minibuffer-local-map)
- str)
+ str junk-hist)
+
+ ;; PROMPT contains text-properties from
+ ;; `minibuffer-prompt-properties', and some of these can screw up
+ ;; its use in `read-string' below (specifically, a read-only
+ ;; property will cause it to signal an error), so strip them here;
+ ;; read-string will add the same properties itself anyway.
+ ;;
+ (set-text-properties 0 (length prompt) nil prompt)
+
(if isearch-input-method-function
(let (;; Let input method work rather tersely.
- (input-method-verbose-flag nil)
- (isearch-minibuffer-input-method current-input-method)
- (isearch-minibuffer-input-method-function
- isearch-input-method-function))
+ (input-method-verbose-flag nil))
(setq unread-command-events
(cons 'with-input-method
(cons last-char unread-command-events))
- str (read-string prompt))
- (if (not str)
+ ;; Inherit current-input-method in a minibuffer.
+ str (read-string prompt isearch-message 'junk-hist nil t))
+ (if (or (not str) (< (length str) (length isearch-message)))
;; All inputs were deleted while the input method
;; was working.
(setq str "")
+ (setq str (substring str (length isearch-message)))
(if (and (= (length str) 1)
- (= (aref str 0) last-char))
+ (= (aref str 0) last-char)
+ (>= last-char 128))
;; The input method couldn't handle LAST-CHAR.
(setq str nil)))))
(setq unread-command-events
(cons 'with-keyboard-coding
(cons last-char unread-command-events))
- str (read-string prompt)))
+ str (read-string prompt nil 'junk-hist)))
(if (and str (> (length str) 0))
(let ((unread-command-events nil))
- (isearch-process-search-string str str))
+ (if (and (integerp count) (> count 1))
+ (let ((strs (mapconcat 'identity (make-list count str) "")))
+ (isearch-process-search-string strs strs))
+ (isearch-process-search-string str str)))
(isearch-update)))
- (isearch-process-search-char last-char)))
+ (isearch-process-search-char last-char count)))
;;; isearch-x.el ends here