Merge from emacs--rel--22

[bpt/emacs.git] / lisp / isearchb.el

diff --git a/lisp/isearchb.el b/lisp/isearchb.el
index 9714701..3d8af06 100644 (file)
--- a/lisp/isearchb.el
+++ b/lisp/isearchb.el
@@ -1,8 +1,9 @@
 ;;; isearchb --- a marriage between iswitchb and isearch
 
-;; Copyright (C) 2004 John Wiegley
+;; Copyright (C) 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <johnw@gnu.org>
+;; Maintainer: FSF
 ;; Created: 16 Apr 2004
 ;; Version: 1.5
 ;; Keywords: lisp
@@ -22,8 +23,8 @@
 
 ;; 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.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
@@ -114,7 +115,7 @@ If nil, don't use a timeout."
 
 (defun isearchb-iswitchb ()
   "isearchb's custom version of the `iswitchb' command.
-It's purpose is to pass different call arguments to
+Its purpose is to pass different call arguments to
 `iswitchb-read-buffer'."
   (interactive)
   (let* ((prompt "iswitch ")
@@ -151,7 +152,7 @@ It's purpose is to pass different call arguments to
       (switch-to-buffer buf)
       (if isearchb-show-completions
          (message "isearchb: %s%s" iswitchb-text
-                  (iswitchb-completions iswitchb-text nil))
+                  (iswitchb-completions iswitchb-text))
        (if (= 1 (length iswitchb-matches))
            (message "isearchb: %s (only match)" iswitchb-text)
          (message "isearchb: %s" iswitchb-text))))))
@@ -164,7 +165,7 @@ It's purpose is to pass different call arguments to
        (define-key global-map (vector (list modifier i)) 'isearchb))))
 
 (defun isearchb-follow-char ()
-  "Function added to post-command-hook to handle the isearchb \"mode\"."
+  "Function added to `post-command-hook' to handle the isearchb \"mode\"."
   (let (keys)
     (if (not (and (memq last-command '(isearchb isearchb-activate))
                  (setq keys (this-command-keys))
@@ -213,7 +214,7 @@ accessed via isearchb."
    ((eq last-command 'isearchb-activate)
     (if isearchb-last-buffer
        (switch-to-buffer isearchb-last-buffer)
-      (error "isearchb: There is no previous buffer to toggle to."))
+      (error "isearchb: There is no previous buffer to toggle to"))
     (isearchb-stop nil t))
    (t
     (message "isearchb: ")