Merge from gnus--devo--0

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

diff --git a/lisp/isearchb.el b/lisp/isearchb.el
index 3665311..ced3781 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, 2008 Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <johnw@gnu.org>
+;; Maintainer: FSF
 ;; Created: 16 Apr 2004
 ;; Version: 1.5
 ;; Keywords: lisp
@@ -10,10 +11,10 @@
 
 ;; 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
@@ -21,9 +22,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:
 
@@ -114,7 +113,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 ")
@@ -164,7 +163,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))
@@ -223,5 +222,5 @@ accessed via isearchb."
 
 (provide 'isearchb)
 
-;;; arch-tag: 9277523f-a624-4aa0-ba10-b89eeb7b6e99
+;; arch-tag: 9277523f-a624-4aa0-ba10-b89eeb7b6e99
 ;;; isearchb.el ends here