X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/b35f288d478ef137a4d9e8e5a6a5f368a86b01f5..da5ecfa9b951691fc8bbf17f24fc8626216a706b:/lisp/isearchb.el

diff --git a/lisp/isearchb.el b/lisp/isearchb.el
index ced3781e5c..a5e3743c55 100644
--- a/lisp/isearchb.el
+++ b/lisp/isearchb.el
@@ -1,6 +1,6 @@
 ;;; isearchb --- a marriage between iswitchb and isearch
 
-;; Copyright (C) 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+;; Copyright (C) 2004-2014 Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <johnw@gnu.org>
 ;; Maintainer: FSF
@@ -82,14 +82,14 @@
   :group 'iswitchb)
 
 (defcustom isearchb-idle-timeout nil
-  "*Number of idle seconds before isearchb turns itself off.
+  "Number of idle seconds before isearchb turns itself off.
 If nil, don't use a timeout."
   :type '(choice (integer :tag "Seconds")
 		 (const :tag "Disable" nil))
   :group 'isearchb)
 
 (defcustom isearchb-show-completions t
-  "*If non-nil, show possible completions in the minibuffer."
+  "If non-nil, show possible completions in the minibuffer."
   :type 'boolean
   :group 'isearchb)
 
@@ -136,10 +136,11 @@ Its purpose is to pass different call arguments to
   (unless iswitchb-text
     (setq iswitchb-text "")
     (iswitchb-make-buflist nil))
-  (if last-command-char
+  (if last-command-event
       (setq iswitchb-rescan t
 	    iswitchb-text (concat iswitchb-text
-				  (char-to-string last-command-char))))
+				  (char-to-string
+				   (event-basic-type last-command-event)))))
   (iswitchb-set-matches)
   (let* ((match (car iswitchb-matches))
 	 (buf (and match (get-buffer match))))
@@ -176,17 +177,17 @@ Its purpose is to pass different call arguments to
 	      (substring iswitchb-text 0 (1- (length iswitchb-text))))
 	(if (= 0 (length iswitchb-text))
 	    (isearchb-stop t t)
-	  (setq last-command-char nil)
+	  (setq last-command-event nil)
 	  (setq this-command 'isearchb)))
        ((or (equal keys "\C-i") (equal keys [tab]))
 	(setq this-command 'isearchb-iswitchb))
        ((equal keys "\C-s")
 	(iswitchb-next-match)
-	(setq last-command-char nil)
+	(setq last-command-event nil)
 	(setq this-command 'isearchb))
        ((equal keys "\C-r")
 	(iswitchb-prev-match)
-	(setq last-command-char nil)
+	(setq last-command-event nil)
 	(setq this-command 'isearchb))
        ((equal keys "\C-g")
 	(ding)
@@ -222,5 +223,4 @@ accessed via isearchb."
 
 (provide 'isearchb)
 
-;; arch-tag: 9277523f-a624-4aa0-ba10-b89eeb7b6e99
 ;;; isearchb.el ends here