(diary-file): Doc fix.

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

diff --git a/lisp/iswitchb.el b/lisp/iswitchb.el
index 52915c4..4e89659 100644 (file)
--- a/lisp/iswitchb.el
+++ b/lisp/iswitchb.el
@@ -1,17 +1,17 @@
 ;;; iswitchb.el --- switch between buffers using substrings
 
 ;;; iswitchb.el --- switch between buffers using substrings
 

-;; Copyright (C) 1996, 1997, 2000, 2001, 2003  Free Software Foundation, Inc.
+;; Copyright (C) 1996, 1997, 2000, 2001, 2002, 2003, 2004,
+;;   2005, 2006, 2007, 2008 Free Software Foundation, Inc.

 
 ;; Author: Stephen Eglen <stephen@gnu.org>
 ;; Maintainer: Stephen Eglen <stephen@gnu.org>
 ;; Keywords: completion convenience
 
 ;; Author: Stephen Eglen <stephen@gnu.org>
 ;; Maintainer: Stephen Eglen <stephen@gnu.org>
 ;; Keywords: completion convenience

-;; location: http://www.anc.ed.ac.uk/~stephen/emacs/

 
 ;; This file is part of GNU Emacs.
 
 ;; 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
 
 ;; This file is part of GNU Emacs.
 
 ;; 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)
+;; the Free Software Foundation; either version 3, or (at your option)

 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,


@@ -21,8 +21,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
 
 ;; 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:
 
 
 ;;; Commentary:
 


@@ -165,11 +165,10 @@
 
 ;; Font-Lock
 
 
 ;; Font-Lock
 

-;; If you have font-lock loaded, the first matching buffer is
-;; highlighted.  To switch this off, set (setq iswitchb-use-fonts nil)
-;; I don't use font-lock that much, so I've hardcoded the faces.  If
-;; this is too harsh, let me know.  Colouring of the matching buffer
-;; name was suggested by Carsten Dominik (dominik@strw.leidenuniv.nl)
+;; font-lock is used to highlight the first matching buffer.  To
+;; switch this off, set (setq iswitchb-use-faces nil).  Colouring of
+;; the matching buffer name was suggested by Carsten Dominik
+;; (dominik@strw.leidenuniv.nl)

 
 ;; Replacement for read-buffer
 
 
 ;; Replacement for read-buffer
 


@@ -230,16 +229,10 @@
 
 ;; Regexp matching
 
 
 ;; Regexp matching
 

-;; There is limited provision for regexp matching within iswitchb,
-;; enabled through `iswitchb-regexp'.  This allows you to type `c$'
-;; for example and see all buffer names ending in `c'.  This facility
-;; is quite limited though in two respects.  First, you can't
-;; currently type in expressions like `[0-9]' directly -- you have to
-;; type them in when iswitchb-regexp is nil and then toggle on the
-;; regexp functionality.  Likewise, don't enter an expression
-;; containing `\' in regexp mode.  If you try, iswitchb gets confused,
-;; so just hit C-g and try again.  Secondly, no completion mechanism
-;; is currently offered when regexp searching.
+;; There is provision for regexp matching within iswitchb, enabled
+;; through `iswitchb-regexp'.  This allows you to type `c$' for
+;; example and see all buffer names ending in `c'.  No completion
+;; mechanism is currently offered when regexp searching.

 
 ;;; TODO
 
 
 ;;; TODO
 


@@ -251,24 +244,7 @@
 
 ;;; Code:
 
 
 ;;; Code:
 

-;; CL needed for cadr and last
-(if (not (and (fboundp 'cadr)
-             (fboundp 'last)))
-    (require 'cl))
-
-;; Set up the custom library.
-;; taken from http://www.dina.kvl.dk/~abraham/custom/
-(eval-and-compile
-  (condition-case ()
-      (require 'custom)
-    (error nil))
-  (if (and (featurep 'custom) (fboundp 'custom-declare-variable))
-      nil ;; We've got what we needed
-    ;; We have the old custom-library, hack around it!
-    (defmacro defgroup (&rest args)
-      nil)
-    (defmacro defcustom (var value doc &rest args)
-      `(defvar ,var ,value ,doc))))
+(require 'font-lock)

 
 ;;; User Variables
 ;;
 
 ;;; User Variables
 ;;


@@ -294,9 +270,10 @@ is temporarily case sensitive."
   "*List of regexps or functions matching buffer names to ignore.
 For example, traditional behavior is not to list buffers whose names begin
 with a space, for which the regexp is `^ '.  See the source file for
   "*List of regexps or functions matching buffer names to ignore.
 For example, traditional behavior is not to list buffers whose names begin
 with a space, for which the regexp is `^ '.  See the source file for

-example functions that filter buffernames."
+example functions that filter buffer names."

   :type '(repeat (choice regexp function))
   :group 'iswitchb)
   :type '(repeat (choice regexp function))
   :group 'iswitchb)

+(put 'iswitchb-buffer-ignore 'risky-local-variable t)

 
 (defcustom iswitchb-max-to-show nil
   "*If non-nil, limit the number of names shown in the minibuffer.
 
 (defcustom iswitchb-max-to-show nil
   "*If non-nil, limit the number of names shown in the minibuffer.


@@ -329,15 +306,14 @@ window with completion alternatives, or `iswitchb-next-match' or
   :type 'hook
   :group 'iswitchb)
 
   :type 'hook
   :group 'iswitchb)
 

-;;; Examples for setting the value of iswitchb-buffer-ignore
-;(defun iswitchb-ignore-c-mode (name)
-;  "Ignore all c mode buffers -- example function for iswitchb."
-;  (save-excursion
-;    (set-buffer name)
-;    (string-match "^C$" mode-name)))
+;; Examples for setting the value of iswitchb-buffer-ignore
+;;(defun iswitchb-ignore-c-mode (name)
+;;  "Ignore all c mode buffers -- example function for iswitchb."
+;;  (with-current-buffer name
+;;    (derived-mode-p 'c-mode)))

 
 

-;(setq iswitchb-buffer-ignore '("^ " iswitchb-ignore-c-mode))
-;(setq iswitchb-buffer-ignore '("^ " "\\.c$" "\\.h$"))
+;;(setq iswitchb-buffer-ignore '("^ " iswitchb-ignore-c-mode))
+;;(setq iswitchb-buffer-ignore '("^ " "\\.c\\'" "\\.h\\'"))

 
 (defcustom iswitchb-default-method  'always-frame
     "*How to switch to new buffer when using `iswitchb-buffer'.
 
 (defcustom iswitchb-default-method  'always-frame
     "*How to switch to new buffer when using `iswitchb-buffer'.


@@ -377,10 +353,11 @@ See also `iswitchb-newbuffer'."
   :type 'boolean
   :group 'iswitchb)
 
   :type 'boolean
   :group 'iswitchb)
 

-(defcustom iswitchb-use-fonts t
-  "*Non-nil means use font-lock fonts for showing first match."
+(defcustom iswitchb-use-faces t
+  "*Non-nil means use font-lock faces for showing first match."

   :type 'boolean
   :group 'iswitchb)
   :type 'boolean
   :group 'iswitchb)

+(define-obsolete-variable-alias 'iswitchb-use-fonts 'iswitchb-use-faces "22.1")

 
 (defcustom iswitchb-use-frame-buffer-list nil
   "*Non-nil means use the currently selected frame's buffer list."
 
 (defcustom iswitchb-use-frame-buffer-list nil
   "*Non-nil means use the currently selected frame's buffer list."


@@ -399,7 +376,7 @@ See documentation of `walk-windows' for useful values.")
 (defcustom iswitchb-minibuffer-setup-hook nil
   "Iswitchb-specific customization of minibuffer setup.
 
 (defcustom iswitchb-minibuffer-setup-hook nil
   "Iswitchb-specific customization of minibuffer setup.
 

-This hook is run during minibuffer setup iff `iswitchb' will be active.
+This hook is run during minibuffer setup if `iswitchb' is active.

 For instance:
 \(add-hook 'iswitchb-minibuffer-setup-hook
          '\(lambda () (set (make-local-variable 'max-mini-window-height) 3)))
 For instance:
 \(add-hook 'iswitchb-minibuffer-setup-hook
          '\(lambda () (set (make-local-variable 'max-mini-window-height) 3)))


@@ -408,6 +385,35 @@ iswitchb is running."
   :type 'hook
   :group 'iswitchb)
 
   :type 'hook
   :group 'iswitchb)
 

+(defface iswitchb-single-match
+  '((t
+     (:inherit font-lock-comment-face)))
+  "Iswitchb face for single matching buffer name."
+  :version "22.1"
+  :group 'iswitchb)
+
+(defface iswitchb-current-match
+  '((t
+     (:inherit font-lock-function-name-face)))
+  "Iswitchb face for current matching buffer name."
+  :version "22.1"
+  :group 'iswitchb)
+
+(defface iswitchb-virtual-matches
+  '((t
+     (:inherit font-lock-builtin-face)))
+  "Iswitchb face for matching virtual buffer names.
+See also `iswitchb-use-virtual-buffers'."
+  :version "22.1"
+  :group 'iswitchb)
+
+(defface iswitchb-invalid-regexp
+  '((t
+     (:inherit font-lock-warning-face)))
+  "Iswitchb face for indicating invalid regexp. "
+  :version "22.1"
+  :group 'iswitchb)
+

 ;; Do we need the variable iswitchb-use-mycompletion?
 
 ;;; Internal Variables
 ;; Do we need the variable iswitchb-use-mycompletion?
 
 ;;; Internal Variables


@@ -469,14 +475,13 @@ interfere with other minibuffer usage.")
 
 (defvar iswitchb-global-map
   (let ((map (make-sparse-keymap)))
 
 (defvar iswitchb-global-map
   (let ((map (make-sparse-keymap)))

-    (substitute-key-definition 'switch-to-buffer ; normally C-x b
-                              'iswitchb-buffer map global-map)
-    (substitute-key-definition 'switch-to-buffer-other-window ; C-x 4 b
-                              'iswitchb-buffer-other-window map global-map)
-    (substitute-key-definition 'switch-to-buffer-other-frame ; C-x 5 b
-                              'iswitchb-buffer-other-frame map global-map)
-    (substitute-key-definition 'display-buffer ; C-x 4 C-o
-                              'iswitchb-display-buffer map global-map)
+    (dolist (b '((switch-to-buffer . iswitchb-buffer)
+                 (switch-to-buffer-other-window . iswitchb-buffer-other-window)
+                 (switch-to-buffer-other-frame . iswitchb-buffer-other-frame)
+                 (display-buffer . iswitchb-display-buffer)))
+      (if (fboundp 'command-remapping)
+          (define-key map (vector 'remap (car b)) (cdr b))
+        (substitute-key-definition (car b) (cdr b) map global-map)))

     map)
   "Global keymap for `iswitchb-mode'.")
 
     map)
   "Global keymap for `iswitchb-mode'.")
 


@@ -507,13 +512,16 @@ selected.")
 (defvar iswitchb-minibuf-depth nil
   "Value we expect to be returned by `minibuffer-depth' in the minibuffer.")
 
 (defvar iswitchb-minibuf-depth nil
   "Value we expect to be returned by `minibuffer-depth' in the minibuffer.")
 

+(defvar iswitchb-common-match-inserted nil
+  "Non-nil if we have just inserted a common match in the minibuffer.")
+
+(defvar iswitchb-invalid-regexp)
+

 ;;; FUNCTIONS
 
 ;;; ISWITCHB KEYMAP
 (defun iswitchb-define-mode-map ()
 ;;; FUNCTIONS
 
 ;;; ISWITCHB KEYMAP
 (defun iswitchb-define-mode-map ()

-  "Set up the keymap for `iswitchb-buffer'.
-This is obsolete.  Use \\[iswitchb-mode] or customize the
-variable `iswitchb-mode'."
+  "Set up the keymap for `iswitchb-buffer'."

   (interactive)
   (let (map)
     ;; generated every time so that it can inherit new functions.
   (interactive)
   (let (map)
     ;; generated every time so that it can inherit new functions.


@@ -527,13 +535,17 @@ variable `iswitchb-mode'."
     (define-key map "\C-j" 'iswitchb-select-buffer-text)
     (define-key map "\C-t" 'iswitchb-toggle-regexp)
     (define-key map "\C-x\C-f" 'iswitchb-find-file)
     (define-key map "\C-j" 'iswitchb-select-buffer-text)
     (define-key map "\C-t" 'iswitchb-toggle-regexp)
     (define-key map "\C-x\C-f" 'iswitchb-find-file)

-    ;;(define-key map "\C-a" 'iswitchb-toggle-ignore)
+    (define-key map "\C-n" 'iswitchb-toggle-ignore)

     (define-key map "\C-c" 'iswitchb-toggle-case)
     (define-key map "\C-k" 'iswitchb-kill-buffer)
     (define-key map "\C-m" 'iswitchb-exit-minibuffer)
     (setq iswitchb-mode-map map)
     (run-hooks 'iswitchb-define-mode-map-hook)))
 
     (define-key map "\C-c" 'iswitchb-toggle-case)
     (define-key map "\C-k" 'iswitchb-kill-buffer)
     (define-key map "\C-m" 'iswitchb-exit-minibuffer)
     (setq iswitchb-mode-map map)
     (run-hooks 'iswitchb-define-mode-map-hook)))
 

+(make-obsolete 'iswitchb-define-mode-map
+              "use M-x iswitchb-mode or customize the variable `iswitchb-mode'."
+              "21.1")
+

 ;;; MAIN FUNCTION
 (defun iswitchb ()
   "Switch to buffer matching a substring.
 ;;; MAIN FUNCTION
 (defun iswitchb ()
   "Switch to buffer matching a substring.


@@ -564,6 +576,7 @@ in a separate window.
   ;;`iswitchb-buffer-ignore')
 
   (let* ((prompt "iswitch ")
   ;;`iswitchb-buffer-ignore')
 
   (let* ((prompt "iswitch ")

+         iswitchb-invalid-regexp

         (buf (iswitchb-read-buffer prompt)))
 
     ;;(message "chosen text %s" iswitchb-final-text)
         (buf (iswitchb-read-buffer prompt)))
 
     ;;(message "chosen text %s" iswitchb-final-text)


@@ -572,7 +585,8 @@ in a separate window.
 
     (cond ( (eq iswitchb-exit 'findfile)
            (call-interactively 'find-file))
 
     (cond ( (eq iswitchb-exit 'findfile)
            (call-interactively 'find-file))

-
+          (iswitchb-invalid-regexp
+           (message "Won't make invalid regexp named buffer"))

          (t
           ;; View the buffer
           ;;(message "go to buf %s" buf)
          (t
           ;; View the buffer
           ;;(message "go to buf %s" buf)


@@ -592,7 +606,7 @@ Return the name of a buffer selected.
 PROMPT is the prompt to give to the user.
 DEFAULT if given is the default buffer to be selected, which will
 go to the front of the list.
 PROMPT is the prompt to give to the user.
 DEFAULT if given is the default buffer to be selected, which will
 go to the front of the list.

-If REQUIRE-MATCH is non-nil, an existing-buffer must be selected.
+If REQUIRE-MATCH is non-nil, an existing buffer must be selected.

 If START is a string, the selection process is started with that
 string.
 If MATCHES-SET is non-nil, the buflist is not updated before
 If START is a string, the selection process is started with that
 string.
 If MATCHES-SET is non-nil, the buflist is not updated before


@@ -602,10 +616,7 @@ the selection process begins.  Used by isearchb.el."
        buf-sel
        iswitchb-final-text
        (icomplete-mode nil) ;; prevent icomplete starting up
        buf-sel
        iswitchb-final-text
        (icomplete-mode nil) ;; prevent icomplete starting up

-       ;; can only use fonts if they have been bound.
-       (iswitchb-use-fonts (and iswitchb-use-fonts
-                               (boundp 'font-lock-comment-face)
-                               (boundp 'font-lock-function-name-face))))
+       )

 
     (iswitchb-define-mode-map)
     (setq iswitchb-exit nil)
 
     (iswitchb-define-mode-map)
     (setq iswitchb-exit nil)


@@ -674,7 +685,7 @@ the selection process begins.  Used by isearchb.el."
   "Find common completion of `iswitchb-text' in `iswitchb-matches'.
 The result is stored in `iswitchb-common-match-string'."
 
   "Find common completion of `iswitchb-text' in `iswitchb-matches'.
 The result is stored in `iswitchb-common-match-string'."
 

-  (let* (val)
+  (let (val)

     (setq  iswitchb-common-match-string nil)
     (if (and iswitchb-matches
             (not iswitchb-regexp) ;; testing
     (setq  iswitchb-common-match-string nil)
     (if (and iswitchb-matches
             (not iswitchb-regexp) ;; testing


@@ -691,7 +702,9 @@ The result is stored in `iswitchb-common-match-string'."
   (let (res)
     (cond ((not  iswitchb-matches)
           (run-hooks 'iswitchb-cannot-complete-hook))
   (let (res)
     (cond ((not  iswitchb-matches)
           (run-hooks 'iswitchb-cannot-complete-hook))

-
+          (iswitchb-invalid-regexp
+           ;; Do nothing
+           )

          ((= 1 (length iswitchb-matches))
           ;; only one choice, so select it.
           (exit-minibuffer))
          ((= 1 (length iswitchb-matches))
           ;; only one choice, so select it.
           (exit-minibuffer))


@@ -703,7 +716,8 @@ The result is stored in `iswitchb-common-match-string'."
                    (not (equal res iswitchb-text)))
               ;; found something to complete, so put it in the minibuffer.
               (progn
                    (not (equal res iswitchb-text)))
               ;; found something to complete, so put it in the minibuffer.
               (progn

-                (setq iswitchb-rescan nil)
+                (setq iswitchb-rescan nil
+                       iswitchb-common-match-inserted t)

                 (delete-region (minibuffer-prompt-end) (point))
                 (insert  res))
             ;; else nothing to complete
                 (delete-region (minibuffer-prompt-end) (point))
                 (insert  res))
             ;; else nothing to complete


@@ -761,8 +775,7 @@ If no buffer exactly matching the prompt exists, maybe create a new one."
   (setq iswitchb-exit 'findfile)
   (exit-minibuffer))
 
   (setq iswitchb-exit 'findfile)
   (exit-minibuffer))
 

-(eval-when-compile
-  (defvar recentf-list))
+(defvar recentf-list)

 
 (defun iswitchb-next-match ()
   "Put first element of `iswitchb-matches' at the end of the list."
 
 (defun iswitchb-next-match ()
   "Put first element of `iswitchb-matches' at the end of the list."


@@ -839,10 +852,8 @@ it is put to the start of the list."
 
 (defun iswitchb-to-end (lst)
   "Move the elements from LST to the end of `iswitchb-temp-buflist'."
 
 (defun iswitchb-to-end (lst)
   "Move the elements from LST to the end of `iswitchb-temp-buflist'."

-  (mapcar
-   (lambda (elem)
-     (setq iswitchb-temp-buflist (delq elem iswitchb-temp-buflist)))
-   lst)
+  (dolist (elem lst)
+    (setq iswitchb-temp-buflist (delq elem iswitchb-temp-buflist)))

   (setq iswitchb-temp-buflist (nconc iswitchb-temp-buflist lst)))
 
 (defun iswitchb-get-buffers-in-frames (&optional current)
   (setq iswitchb-temp-buflist (nconc iswitchb-temp-buflist lst)))
 
 (defun iswitchb-get-buffers-in-frames (&optional current)


@@ -873,7 +884,7 @@ current frame, rather than all frames, regardless of value of
   "Set `iswitchb-matches' to the list of buffers matching prompt."
   (if iswitchb-rescan
       (setq iswitchb-matches
   "Set `iswitchb-matches' to the list of buffers matching prompt."
   (if iswitchb-rescan
       (setq iswitchb-matches

-           (let* ((buflist iswitchb-buflist))
+           (let ((buflist iswitchb-buflist))

              (iswitchb-get-matched-buffers iswitchb-text iswitchb-regexp
                                            buflist))
            iswitchb-virtual-buffers nil)))
              (iswitchb-get-matched-buffers iswitchb-text iswitchb-regexp
                                            buflist))
            iswitchb-virtual-buffers nil)))


@@ -883,29 +894,19 @@ current frame, rather than all frames, regardless of value of
   "Return buffers matching REGEXP.
 If STRING-FORMAT is nil, consider REGEXP as just a string.
 BUFFER-LIST can be list of buffers or list of strings."
   "Return buffers matching REGEXP.
 If STRING-FORMAT is nil, consider REGEXP as just a string.
 BUFFER-LIST can be list of buffers or list of strings."

-  (let* ((case-fold-search  (iswitchb-case))
-        ;; need reverse since we are building up list backwards
-        (list              (reverse buffer-list))
-         (do-string         (stringp (car list)))
-         name
-         ret)
-    (mapcar
-     (lambda (x)
-
-       (if do-string
-          (setq name x)               ;We already have the name
-        (setq name (buffer-name x)))
-
-       (cond
-       ((and (or (and string-format (string-match regexp name))
-                 (and (null string-format)
-                      (string-match (regexp-quote regexp) name)))
-
-             (not (iswitchb-ignore-buffername-p name)))
-        (setq ret (cons name ret))
-          )))
-     list)
-    ret))
+  (let ((case-fold-search (iswitchb-case))
+         name ret)
+    (if (null string-format) (setq regexp (regexp-quote regexp)))
+    (setq iswitchb-invalid-regexp nil)
+    (condition-case error
+        (dolist (x buffer-list (nreverse ret))
+          (setq name (if (stringp x) x (buffer-name x)))
+          (when (and (string-match regexp name)
+                     (not (iswitchb-ignore-buffername-p name)))
+            (push name ret)))
+      (invalid-regexp
+       (setq iswitchb-invalid-regexp t)
+       (cdr error)))))

 
 (defun iswitchb-ignore-buffername-p (bufname)
   "Return t if the buffer BUFNAME should be ignored."
 
 (defun iswitchb-ignore-buffername-p (bufname)
   "Return t if the buffer BUFNAME should be ignored."


@@ -921,7 +922,7 @@ BUFFER-LIST can be list of buffers or list of strings."
             (progn
               (setq ignorep t)
               (setq re-list nil))))
             (progn
               (setq ignorep t)
               (setq re-list nil))))

-       ((fboundp nextstr)
+       ((functionp nextstr)

         (if (funcall nextstr bufname)
             (progn
               (setq ignorep t)
         (if (funcall nextstr bufname)
             (progn
               (setq ignorep t)


@@ -989,7 +990,8 @@ Return the modified list with the last element prepended to it."
        (temp-buf "*Completions*")
        (win))
 
        (temp-buf "*Completions*")
        (win))
 

-    (if (eq last-command this-command)
+    (if (and (eq last-command this-command)
+             (not iswitchb-common-match-inserted))

        ;; scroll buffer
        (progn
          (set-buffer temp-buf)
        ;; scroll buffer
        (progn
          (set-buffer temp-buf)


@@ -1016,8 +1018,8 @@ Return the modified list with the last element prepended to it."
            (fundamental-mode))
          (display-completion-list (if iswitchb-matches
                                       iswitchb-matches
            (fundamental-mode))
          (display-completion-list (if iswitchb-matches
                                       iswitchb-matches

-                                    iswitchb-buflist))
-         )))))
+                                    iswitchb-buflist))))
+      (setq iswitchb-common-match-inserted nil))))

 
 ;;; KILL CURRENT BUFFER
 
 
 ;;; KILL CURRENT BUFFER
 


@@ -1045,7 +1047,7 @@ Return the modified list with the last element prepended to it."
 ;;; VISIT CHOSEN BUFFER
 (defun iswitchb-visit-buffer (buffer)
   "Visit buffer named BUFFER according to `iswitchb-method'."
 ;;; VISIT CHOSEN BUFFER
 (defun iswitchb-visit-buffer (buffer)
   "Visit buffer named BUFFER according to `iswitchb-method'."

-  (let* (win  newframe)
+  (let (win newframe)

     (cond
      ((eq iswitchb-method 'samewindow)
       (switch-to-buffer buffer))
     (cond
      ((eq iswitchb-method 'samewindow)
       (switch-to-buffer buffer))


@@ -1100,7 +1102,7 @@ Return the modified list with the last element prepended to it."
              (set-buffer-major-mode newbufcreated))
          (iswitchb-visit-buffer newbufcreated))
       ;; else wont create new buffer
              (set-buffer-major-mode newbufcreated))
          (iswitchb-visit-buffer newbufcreated))
       ;; else wont create new buffer

-      (message (format "no buffer matching `%s'" buf)))))
+      (message "no buffer matching `%s'" buf))))

 
 (defun iswitchb-window-buffer-p  (buffer)
   "Return window pointer if BUFFER is visible in another frame.
 
 (defun iswitchb-window-buffer-p  (buffer)
   "Return window pointer if BUFFER is visible in another frame.


@@ -1117,9 +1119,7 @@ If BUFFER is visible in the current frame, return nil."
 (defun iswitchb-default-keybindings ()
   "Set up default keybindings for `iswitchb-buffer'.
 Call this function to override the normal bindings.  This function also
 (defun iswitchb-default-keybindings ()
   "Set up default keybindings for `iswitchb-buffer'.
 Call this function to override the normal bindings.  This function also

-adds a hook to the minibuffer.
-
-Obsolescent.  Use `iswitchb-mode'."
+adds a hook to the minibuffer."

   (interactive)
   (add-hook 'minibuffer-setup-hook 'iswitchb-minibuffer-setup)
   (global-set-key "\C-xb" 'iswitchb-buffer)
   (interactive)
   (add-hook 'minibuffer-setup-hook 'iswitchb-minibuffer-setup)
   (global-set-key "\C-xb" 'iswitchb-buffer)


@@ -1127,6 +1127,8 @@ Obsolescent.  Use `iswitchb-mode'."
   (global-set-key "\C-x4\C-o" 'iswitchb-display-buffer)
   (global-set-key "\C-x5b" 'iswitchb-buffer-other-frame))
 
   (global-set-key "\C-x4\C-o" 'iswitchb-display-buffer)
   (global-set-key "\C-x5b" 'iswitchb-buffer-other-frame))
 

+(make-obsolete 'iswitchb-default-keybindings 'iswitchb-mode "21.1")
+

 (defun iswitchb-buffer ()
   "Switch to another buffer.
 
 (defun iswitchb-buffer ()
   "Switch to another buffer.
 


@@ -1227,12 +1229,10 @@ Copied from `icomplete-exhibit' with two changes:
 
          ;; Insert the match-status information:
          (insert (iswitchb-completions
 
          ;; Insert the match-status information:
          (insert (iswitchb-completions

-                  contents
-                  (not minibuffer-completion-confirm)))))))
+                  contents))))))

 
 

-(eval-when-compile
-  (defvar most-len)
-  (defvar most-is-exact))
+(defvar most-len)
+(defvar most-is-exact)

 
 (defun iswitchb-output-completion (com)
   (if (= (length com) most-len)
 
 (defun iswitchb-output-completion (com)
   (if (= (length com) most-len)


@@ -1243,27 +1243,29 @@ Copied from `icomplete-exhibit' with two changes:
        (setq most-is-exact t))
     (substring com most-len)))
 
        (setq most-is-exact t))
     (substring com most-len)))
 

-(defun iswitchb-completions (name require-match)
+(defun iswitchb-completions (name)

   "Return the string that is displayed after the user's text.
 Modified from `icomplete-completions'."
 
   (let ((comps iswitchb-matches)
                                         ; "-determined" - only one candidate
   "Return the string that is displayed after the user's text.
 Modified from `icomplete-completions'."
 
   (let ((comps iswitchb-matches)
                                         ; "-determined" - only one candidate

-        (open-bracket-determined (if require-match "(" "["))
-        (close-bracket-determined (if require-match ")" "]"))
+        (open-bracket-determined "[")
+        (close-bracket-determined "]")

                                         ;"-prospects" - more than one candidate
         (open-bracket-prospects "{")
         (close-bracket-prospects "}")
        first)
 
                                         ;"-prospects" - more than one candidate
         (open-bracket-prospects "{")
         (close-bracket-prospects "}")
        first)
 

-    (if (and iswitchb-use-fonts  comps)
+    (if (and iswitchb-use-faces comps)

        (progn
          (setq first (car comps))
          (setq first (format "%s" first))
          (put-text-property 0 (length first) 'face
                             (if (= (length comps) 1)
        (progn
          (setq first (car comps))
          (setq first (format "%s" first))
          (put-text-property 0 (length first) 'face
                             (if (= (length comps) 1)

-                                'font-lock-comment-face
-                              'font-lock-function-name-face)
+                                 (if iswitchb-invalid-regexp
+                                     'iswitchb-invalid-regexp
+                                   'iswitchb-single-match)
+                              'iswitchb-current-match)

                             first)
          (setq comps  (cons first (cdr comps)))))
 
                             first)
          (setq comps  (cons first (cdr comps)))))
 


@@ -1292,7 +1294,7 @@ Modified from `icomplete-completions'."
        (let ((comp comps))
          (while comp
            (put-text-property 0 (length (car comp))
        (let ((comp comps))
          (while comp
            (put-text-property 0 (length (car comp))

-                              'face 'font-lock-builtin-face
+                              'face 'iswitchb-virtual-matches

                               (car comp))
            (setq comp (cdr comp))))))
 
                               (car comp))
            (setq comp (cdr comp))))))
 


@@ -1300,16 +1302,23 @@ Modified from `icomplete-completions'."
                                open-bracket-determined
                                close-bracket-determined))
 
                                open-bracket-determined
                                close-bracket-determined))
 

-         ((null (cdr comps))           ;one match
-          (concat (if (and (> (length (car comps))
-                              (length name)))
-                      (concat open-bracket-determined
+         (iswitchb-invalid-regexp
+           (concat " " (car comps)))
+          ((null (cdr comps))          ;one match
+          (concat
+            (if (if (not iswitchb-regexp)
+                    (= (length name)
+                       (length (car comps)))
+                  (string-match name (car comps))
+                  (string-equal (match-string 0 (car comps))
+                                (car comps)))
+                ""
+              (concat open-bracket-determined

                               ;; when there is one match, show the
                               ;; matching buffer name in full
                               (car comps)
                               ;; when there is one match, show the
                               ;; matching buffer name in full
                               (car comps)

-                              close-bracket-determined)
-                    "")
-                  (if (not iswitchb-use-fonts) " [Matched]")))
+                              close-bracket-determined))
+                  (if (not iswitchb-use-faces) " [Matched]")))

          (t                            ;multiple matches
           (if (and iswitchb-max-to-show
                    (> (length comps) iswitchb-max-to-show))
          (t                            ;multiple matches
           (if (and iswitchb-max-to-show
                    (> (length comps) iswitchb-max-to-show))


@@ -1411,7 +1420,7 @@ This is an example function which can be hooked on to
     (iswitchb-to-end summaries)))
 
 (defun iswitchb-case ()
     (iswitchb-to-end summaries)))
 
 (defun iswitchb-case ()

-  "Return non-nil iff we should ignore case when matching.
+  "Return non-nil if we should ignore case when matching.

 See the variable `iswitchb-case' for details."
   (if iswitchb-case
       (if (featurep 'xemacs)
 See the variable `iswitchb-case' for details."
   (if iswitchb-case
       (if (featurep 'xemacs)


@@ -1421,7 +1430,7 @@ See the variable `iswitchb-case' for details."
 ;;;###autoload
 (define-minor-mode iswitchb-mode
   "Toggle Iswitchb global minor mode.
 ;;;###autoload
 (define-minor-mode iswitchb-mode
   "Toggle Iswitchb global minor mode.

-With arg, turn Iswitchb mode on if and only iff ARG is positive.
+With arg, turn Iswitchb mode on if ARG is positive, otherwise turn it off.

 This mode enables switching between buffers using substrings.  See
 `iswitchb' for details."
   nil nil iswitchb-global-map :global t :group 'iswitchb
 This mode enables switching between buffers using substrings.  See
 `iswitchb' for details."
   nil nil iswitchb-global-map :global t :group 'iswitchb


@@ -1431,5 +1440,5 @@ This mode enables switching between buffers using substrings.  See
 
 (provide 'iswitchb)
 
 
 (provide 'iswitchb)
 

-;;; arch-tag: d74198ae-753f-44f2-b34f-0c515398d90a
+;; arch-tag: d74198ae-753f-44f2-b34f-0c515398d90a

 ;;; iswitchb.el ends here
 ;;; iswitchb.el ends here