;;; iswitchb.el --- switch between buffers using substrings
-;; Copyright (C) 1996, 1997, 2000, 2001, 2002, 2003, 2004,
-;; 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+;; Copyright (C) 1996-1997, 2000-2011 Free Software Foundation, Inc.
;; Author: Stephen Eglen <stephen@gnu.org>
;; Maintainer: Stephen Eglen <stephen@gnu.org>
;; t IN | INBOX
;; t In | [No match]
-;;; Customisation
+;;; Customization
;; See the User Variables section below for easy ways to change the
;; functionality of the program. These are accessible using the
;; Font-Lock
;; font-lock is used to highlight the first matching buffer. To
-;; switch this off, set (setq iswitchb-use-faces nil). Colouring of
+;; switch this off, set (setq iswitchb-use-faces nil). Coloring of
;; the matching buffer name was suggested by Carsten Dominik
;; (dominik@strw.leidenuniv.nl)
;; (delete-minibuffer-contents))
;;
;; (add-hook 'iswitchb-define-mode-map-hook
-;; '(lambda () (define-key
+;; (lambda () (define-key
;; iswitchb-mode-map "\C-o"
;; 'iswitchb-exclude-nonmatching)))
(not (iswitchb-existing-buffer-p)))
(let ((virt (car iswitchb-virtual-buffers))
(new-buf))
- ;; Keep the name of the buffer returned by find-file-noselect, as
+ ;; Keep the name of the buffer returned by find-file-noselect, as
;; the buffer 'virt' could be a symlink to a file of a different name.
(setq new-buf (buffer-name (find-file-noselect (cdr virt))))
(setq iswitchb-matches (list new-buf)
(display-completion-list (or iswitchb-matches iswitchb-buflist)
:help-string "iswitchb "
:activate-callback
- (lambda (x y z)
+ (lambda (_x _y _z)
(message "doesn't work yet, sorry!")))
;; else running Emacs
(display-completion-list (or iswitchb-matches iswitchb-buflist))))
(defun iswitchb-kill-buffer ()
"Kill the buffer at the head of `iswitchb-matches'."
(interactive)
- (let ( (enable-recursive-minibuffers t)
- buf)
+ (let ((enable-recursive-minibuffers t)
+ buf)
(setq buf (car iswitchb-matches))
;; check to see if buf is non-nil.
(if buf
- (progn
+ (let ((bufobjs (mapcar (lambda (name)
+ (or (get-buffer name) name))
+ iswitchb-buflist)))
(kill-buffer buf)
;; Check if buffer exists. XEmacs gnuserv.el makes alias
(if (get-buffer buf)
;; buffer couldn't be killed.
(setq iswitchb-rescan t)
- ;; else buffer was killed so remove name from list.
- (setq iswitchb-buflist (delq buf iswitchb-buflist)))))))
+ ;; Else `kill-buffer' succeeds so re-make the buffer list
+ ;; taking into account packages like uniquify may rename
+ ;; buffers, and try to preserve the ordering of buffers.
+ (setq iswitchb-buflist
+ (delq nil (mapcar (lambda (b)
+ (if (bufferp b)
+ (buffer-name b)
+ b))
+ bufobjs))))))))
;;; VISIT CHOSEN BUFFER
(defun iswitchb-visit-buffer (buffer)
(if (fboundp 'set-buffer-major-mode)
(set-buffer-major-mode newbufcreated))
(iswitchb-visit-buffer newbufcreated))
- ;; else wont create new buffer
+ ;; else won't create new buffer
(message "no buffer matching `%s'" buf))))
(defun iswitchb-window-buffer-p (buffer)
If BUFFER is visible in the current frame, return nil."
(interactive)
(let ((blist (iswitchb-get-buffers-in-frames 'current)))
- ;;If the buffer is visible in current frame, return nil
- (if (memq buffer blist)
- nil
- ;; maybe in other frame or icon
+ ;; If the buffer is visible in current frame, return nil
+ (unless (member buffer blist)
+ ;; maybe in other frame or icon
(get-buffer-window buffer 0) ; better than 'visible
)))
-(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."
- (interactive)
- (add-hook 'minibuffer-setup-hook 'iswitchb-minibuffer-setup)
- (global-set-key "\C-xb" 'iswitchb-buffer)
- (global-set-key "\C-x4b" 'iswitchb-buffer-other-window)
- (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.
;; consult the list of past visited files, to see if we can find
;; the file which the user might thought was still open.
(when (and iswitchb-use-virtual-buffers (null comps)
- (or recentf-list bookmark-alist))
+ recentf-list)
(setq iswitchb-virtual-buffers nil)
(let ((head recentf-list) name)
(while head
(setq iswitchb-virtual-buffers
(cons (cons name (car head))
iswitchb-virtual-buffers)))
- (setq head (cdr head))))
- (let ((head bookmark-alist) name path)
- (while head
- (if (and (setq path (cdr (assq 'filename (cdar head))))
- (setq name (file-name-nondirectory path))
- (string-match (if iswitchb-regexp
- iswitchb-text
- (regexp-quote iswitchb-text)) name)
- (null (get-file-buffer path))
- (not (assoc name iswitchb-virtual-buffers))
- (not (iswitchb-ignore-buffername-p name))
- (file-exists-p path))
- (setq iswitchb-virtual-buffers
- (cons (cons name path)
- iswitchb-virtual-buffers)))
- (setq head (cdr head))))
- (setq iswitchb-virtual-buffers (nreverse iswitchb-virtual-buffers)
- comps (mapcar 'car iswitchb-virtual-buffers))
+ (setq head (cdr head)))
+ (setq iswitchb-virtual-buffers (nreverse iswitchb-virtual-buffers)
+ comps (mapcar 'car iswitchb-virtual-buffers))
(let ((comp comps))
(while comp
(put-text-property 0 (length (car comp))
'face 'iswitchb-virtual-matches
(car comp))
- (setq comp (cdr comp)))))
+ (setq comp (cdr comp))))))
(cond ((null comps) (format " %sNo match%s"
open-bracket-determined
;;;###autoload
(define-minor-mode iswitchb-mode
- "Toggle Iswitchb global minor mode.
-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."
+ "Toggle Iswitchb mode.
+With a prefix argument ARG, enable Iswitchb mode if ARG is
+positive, and disable it otherwise. If called from Lisp, enable
+the mode if ARG is omitted or nil.
+
+Iswitchb mode is a global minor mode that enables switching
+between buffers using substrings. See `iswitchb' for details."
nil nil iswitchb-global-map :global t :group 'iswitchb
(if iswitchb-mode
(add-hook 'minibuffer-setup-hook 'iswitchb-minibuffer-setup)
(provide 'iswitchb)
-;; arch-tag: d74198ae-753f-44f2-b34f-0c515398d90a
;;; iswitchb.el ends here
HCoop / bpt / emacs.git / blobdiff