HCoop
/
bpt
/
emacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
* etc/NEWS: Maybe ert-summarize-tests-batch-and-exit worth mentioning.
[bpt/emacs.git]
/
lisp
/
isearchb.el
diff --git
a/lisp/isearchb.el
b/lisp/isearchb.el
index
073841a
..
eb73cb8
100644
(file)
--- a/
lisp/isearchb.el
+++ b/
lisp/isearchb.el
@@
-1,9
+1,9
@@
;;; isearchb --- a marriage between iswitchb and isearch
;;; 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>
;; Author: John Wiegley <johnw@gnu.org>
-;; Maintainer:
FSF
+;; Maintainer:
emacs-devel@gnu.org
;; Created: 16 Apr 2004
;; Version: 1.5
;; Keywords: lisp
;; Created: 16 Apr 2004
;; Version: 1.5
;; Keywords: lisp
@@
-11,10
+11,10
@@
;; This file is part of GNU Emacs.
;; 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
;; 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
;; GNU Emacs is distributed in the hope that it will be useful,
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-22,9
+22,7
@@
;; GNU General Public License for more details.
;; You should have received a copy of the GNU General Public License
;; 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:
;;; Commentary:
@@
-84,14
+82,14
@@
:group 'iswitchb)
(defcustom isearchb-idle-timeout nil
: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 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)
:type 'boolean
:group 'isearchb)
@@
-138,10
+136,11
@@
Its purpose is to pass different call arguments to
(unless iswitchb-text
(setq iswitchb-text "")
(iswitchb-make-buflist nil))
(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
(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))))
(iswitchb-set-matches)
(let* ((match (car iswitchb-matches))
(buf (and match (get-buffer match))))
@@
-178,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)
(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 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 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)
(setq this-command 'isearchb))
((equal keys "\C-g")
(ding)
@@
-224,5
+223,4
@@
accessed via isearchb."
(provide 'isearchb)
(provide 'isearchb)
-;; arch-tag: 9277523f-a624-4aa0-ba10-b89eeb7b6e99
;;; isearchb.el ends here
;;; isearchb.el ends here