rmailmm doc fixes.

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

diff --git a/lisp/isearchb.el b/lisp/isearchb.el
index c76699c..721fce8 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-2011  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., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -83,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)
 
@@ -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 ")
@@ -137,10 +136,10 @@ It's 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 last-command-event))))
   (iswitchb-set-matches)
   (let* ((match (car iswitchb-matches))
         (buf (and match (get-buffer match))))
@@ -151,7 +150,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 +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))
@@ -177,17 +176,17 @@ It's 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)
@@ -213,7 +212,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: ")