; Merge from origin/emacs-25

[gnu-emacs] / lisp / international / isearch-x.el

diff --git a/lisp/international/isearch-x.el b/lisp/international/isearch-x.el
index 2c6d8b2dce977bb1c2377a1b65a07bd11d46a946..09d6d0a1d0b7565045e2b33603d2c620f15d900a 100644 (file)
--- a/lisp/international/isearch-x.el
+++ b/lisp/international/isearch-x.el
@@ -1,23 +1,22 @@
 ;;; isearch-x.el --- extended isearch handling commands
 
-;; Copyright (C) 1997, 2001, 2002, 2003, 2004, 2005, 2006, 2007
-;;   Free Software Foundation, Inc.
+;; Copyright (C) 1997, 2001-2016 Free Software Foundation, Inc.
 ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006, 2007
+;;   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 3, 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
@@ -25,9 +24,7 @@
 ;; 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., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -74,6 +71,7 @@
 
 (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))
@@ -97,7 +95,7 @@
     (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 (isearch-message-prefix))
@@ -139,9 +137,11 @@
 
        (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)))
 
-;;; arch-tag: 1a90a6cf-2cb2-477a-814a-9ff895852822
 ;;; isearch-x.el ends here