* Patch for "virtual buffers" in iswitchb
@ 2004-04-18 11:13 John Wiegley
2004-04-20 21:32 ` John Wiegley
0 siblings, 1 reply; 3+ messages in thread
From: John Wiegley @ 2004-04-18 11:13 UTC (permalink / raw)
Cc: emacs-devel
Haven't signed my general papers yet, and would like some review on
this anyway:
The following patch adds a feature to iswitchb (off by default) that I
call "virtual buffers". Basically, when a buffer visiting a file is
killed, iswitchb remembers the name and location of that file. If the
user then types a search string and fails to match a living buffer,
iswitchb will consult the list of remembered ones, and allow the user
to match against those names. Fontification is changed to reflect
that these are "virtual" matches. If a virtual buffer is selected,
the buffer is resurrected by visiting the last known path associated
with that buffer name.
The motivation for this patch is that many of the files I open using
C-x C-f are being reopened. Combined with a module like session.el,
virtual buffers allow my work environment to become more predictive.
John
Index: iswitchb.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/iswitchb.el,v
retrieving revision 1.48
diff -w -U3 -r1.48 iswitchb.el
--- iswitchb.el 18 Apr 2004 10:31:29 -0000 1.48
+++ iswitchb.el 18 Apr 2004 11:08:53 -0000
@@ -305,6 +305,20 @@
:type 'integer
:group 'iswitchb)
+(defcustom iswitchb-use-virtual-buffers nil
+ "*If non-nil, refer to past buffers when none match."
+ :type 'boolean
+ :set (function
+ (lambda (sym value)
+ (if value
+ (add-hook 'kill-buffer-hook 'iswitchb-remember-file)
+ (remove-hook 'kill-buffer-hook 'iswitchb-remember-file))
+ (set sym value)))
+ :group 'iswitchb)
+
+(defvar iswitchb-virtual-buffer-alist nil)
+(defvar iswitchb-virtual-buffers nil)
+
(defcustom iswitchb-cannot-complete-hook 'iswitchb-completion-help
"*Hook run when `iswitchb-complete' can't complete any more.
The most useful values are `iswitchb-completion-help', which pops up a
@@ -613,7 +627,17 @@
(if (and (not (eq iswitchb-exit 'usefirst))
(get-buffer iswitchb-final-text))
;; This happens for example if the buffer was chosen with the mouse.
- (setq iswitchb-matches (list iswitchb-final-text)))
+ (setq iswitchb-matches (list iswitchb-final-text)
+ iswitchb-virtual-buffers nil))
+
+ (if (and iswitchb-use-virtual-buffers
+ (not (iswitchb-existing-buffer-p))
+ iswitchb-virtual-buffers)
+ (let ((virt (assoc (car iswitchb-virtual-buffers)
+ iswitchb-virtual-buffer-alist)))
+ (find-file-noselect (cdr virt))
+ (setq iswitchb-matches (list (car virt))
+ iswitchb-virtual-buffers nil)))
;; Handling the require-match must be done in a better way.
(if (and require-match (not (iswitchb-existing-buffer-p)))
@@ -833,7 +857,8 @@
(setq iswitchb-matches
(let* ((buflist iswitchb-buflist))
(iswitchb-get-matched-buffers iswitchb-text iswitchb-regexp
- buflist)))))
+ buflist))
+ iswitchb-virtual-buffers nil)))
(defun iswitchb-get-matched-buffers (regexp
&optional string-format buffer-list)
@@ -1192,6 +1217,25 @@
contents
(not minibuffer-completion-confirm)))))))
+(defun iswitchb-remember-file ()
+ (if (and buffer-file-name
+ (file-exists-p buffer-file-name))
+ (let* ((name (file-name-nondirectory buffer-file-name))
+ (virt (assoc name iswitchb-virtual-buffer-alist)))
+ (if virt
+ (setcdr virt buffer-file-name)
+ (setq iswitchb-virtual-buffer-alist
+ (cons (cons name buffer-file-name)
+ iswitchb-virtual-buffer-alist))))))
+
+(defun iswitchb-virtual-buffer-predicate (entry)
+ (let ((name (car entry)))
+ (and (or (and iswitchb-regexp (string-match iswitchb-text name))
+ (and (null iswitchb-regexp)
+ (string-match (regexp-quote iswitchb-text) name)))
+ (not (iswitchb-ignore-buffername-p name))
+ (file-exists-p (cdr entry)))))
+
(defun iswitchb-output-completion (com)
(if (= (length com) most-len)
;; Most is one exact match,
@@ -1225,6 +1273,23 @@
first)
(setq comps (cons first (cdr comps)))))
+ ;; If no buffers matched, and virtual buffers are being used, then
+ ;; consult the list of past visited files, to see if we can find
+ ;; the file which the user might thought was still open.
+ (if (and iswitchb-use-virtual-buffers (null comps)
+ iswitchb-virtual-buffer-alist)
+ (progn
+ (setq iswitchb-virtual-buffers
+ (all-completions "" iswitchb-virtual-buffer-alist
+ 'iswitchb-virtual-buffer-predicate)
+ comps iswitchb-virtual-buffers)
+ (let ((comp comps))
+ (while comp
+ (put-text-property 0 (length (car comp))
+ 'face 'font-lock-builtin-face
+ (car comp))
+ (setq comp (cdr comp))))))
+
(cond ((null comps) (format " %sNo match%s"
open-bracket-determined
close-bracket-determined))
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: Patch for "virtual buffers" in iswitchb
2004-04-18 11:13 Patch for "virtual buffers" in iswitchb John Wiegley
@ 2004-04-20 21:32 ` John Wiegley
2004-04-30 11:41 ` John Wiegley
0 siblings, 1 reply; 3+ messages in thread
From: John Wiegley @ 2004-04-20 21:32 UTC (permalink / raw)
After receiving an e-mail from the author of recentf -- which is
already part of the Emacs distribution and handles maintenance of a
list of "recently opened files" -- I've altered the virtual buffers
patch to iswitchb.el to use that package instead of doing the work
itself:
--- iswitchb.el 18 Apr 2004 03:28:12 -0700 1.48
+++ iswitchb.el 20 Apr 2004 14:30:00 -0700
@@ -305,6 +305,20 @@
:type 'integer
:group 'iswitchb)
+(defcustom iswitchb-use-virtual-buffers nil
+ "*If non-nil, refer to past buffers when none match.
+This feature relies upon the `recentf' package, which will be
+enabled if this variable is configured to a non-nil value."
+ :type 'boolean
+ :require 'recentf
+ :set (function
+ (lambda (sym value)
+ (recentf-mode value)
+ (set sym value)))
+ :group 'iswitchb)
+
+(defvar iswitchb-virtual-buffers nil)
+
(defcustom iswitchb-cannot-complete-hook 'iswitchb-completion-help
"*Hook run when `iswitchb-complete' can't complete any more.
The most useful values are `iswitchb-completion-help', which pops up a
@@ -613,7 +627,16 @@
(if (and (not (eq iswitchb-exit 'usefirst))
(get-buffer iswitchb-final-text))
;; This happens for example if the buffer was chosen with the mouse.
- (setq iswitchb-matches (list iswitchb-final-text)))
+ (setq iswitchb-matches (list iswitchb-final-text)
+ iswitchb-virtual-buffers nil))
+
+ (if (and iswitchb-use-virtual-buffers
+ iswitchb-virtual-buffers
+ (not (iswitchb-existing-buffer-p)))
+ (let ((virt (car iswitchb-virtual-buffers)))
+ (find-file-noselect virt)
+ (setq iswitchb-matches (list (file-name-nondirectory virt))
+ iswitchb-virtual-buffers nil)))
;; Handling the require-match must be done in a better way.
(if (and require-match (not (iswitchb-existing-buffer-p)))
@@ -833,7 +856,8 @@
(setq iswitchb-matches
(let* ((buflist iswitchb-buflist))
(iswitchb-get-matched-buffers iswitchb-text iswitchb-regexp
- buflist)))))
+ buflist))
+ iswitchb-virtual-buffers nil)))
(defun iswitchb-get-matched-buffers (regexp
&optional string-format buffer-list)
@@ -1225,6 +1253,33 @@
first)
(setq comps (cons first (cdr comps)))))
+ ;; If no buffers matched, and virtual buffers are being used, then
+ ;; 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)
+ recentf-list)
+ (setq iswitchb-virtual-buffers nil)
+ (let ((head recentf-list) name)
+ (while head
+ (if (and (null (find-buffer-visiting (car head)))
+ (setq name (file-name-nondirectory (car head)))
+ (or (if iswitchb-regexp
+ (string-match iswitchb-text name))
+ (string-match (regexp-quote iswitchb-text) name))
+ (not (iswitchb-ignore-buffername-p name))
+ (file-exists-p (car head)))
+ (setq iswitchb-virtual-buffers
+ (cons (car head) iswitchb-virtual-buffers)))
+ (setq head (cdr head)))
+ (setq comps (mapcar 'file-name-nondirectory
+ (nreverse iswitchb-virtual-buffers)))
+ (let ((comp comps))
+ (while comp
+ (put-text-property 0 (length (car comp))
+ 'face 'font-lock-builtin-face
+ (car comp))
+ (setq comp (cdr comp))))))
+
(cond ((null comps) (format " %sNo match%s"
open-bracket-determined
close-bracket-determined))
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: Patch for "virtual buffers" in iswitchb
2004-04-20 21:32 ` John Wiegley
@ 2004-04-30 11:41 ` John Wiegley
0 siblings, 0 replies; 3+ messages in thread
From: John Wiegley @ 2004-04-30 11:41 UTC (permalink / raw)
I just mailed off the general assignment papers, so soon I can check
the following patch in. But I wanted to post this new version anyway,
since it runs many, many times faster than the previous patch, and
also represents what I hope is the final state of the code to be
checked in.
I've been relying heavily on this feature since writing it, so I
believe it can be quite useful to current iswitchb users.
John
Index: iswitchb.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/iswitchb.el,v
retrieving revision 1.51
diff -w -U3 -r1.51 iswitchb.el
--- iswitchb.el 21 Apr 2004 09:47:11 -0000 1.51
+++ iswitchb.el 30 Apr 2004 11:38:10 -0000
@@ -307,6 +307,20 @@
:type '(choice (const :tag "Show all" nil) integer)
:group 'iswitchb)
+(defcustom iswitchb-use-virtual-buffers nil
+ "*If non-nil, refer to past buffers when none match.
+This feature relies upon the `recentf' package, which will be
+enabled if this variable is configured to a non-nil value."
+ :type 'boolean
+ :require 'recentf
+ :set (function
+ (lambda (sym value)
+ (recentf-mode value)
+ (set sym value)))
+ :group 'iswitchb)
+
+(defvar iswitchb-virtual-buffers nil)
+
(defcustom iswitchb-cannot-complete-hook 'iswitchb-completion-help
"*Hook run when `iswitchb-complete' can't complete any more.
The most useful values are `iswitchb-completion-help', which pops up a
@@ -572,12 +586,18 @@
))))
;;;###autoload
-(defun iswitchb-read-buffer (prompt &optional default require-match)
+(defun iswitchb-read-buffer (prompt &optional default require-match
+ start matches-set)
"Replacement for the built-in `read-buffer'.
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.
-If REQUIRE-MATCH is non-nil, an existing-buffer must be 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.
+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
+the selection process begins. Used by isearchb.el."
(let
(
buf-sel
@@ -590,14 +610,15 @@
(iswitchb-define-mode-map)
(setq iswitchb-exit nil)
- (setq iswitchb-rescan t)
- (setq iswitchb-text "")
(setq iswitchb-default
(if (bufferp default)
(buffer-name default)
default))
+ (setq iswitchb-text (or start ""))
+ (unless matches-set
+ (setq iswitchb-rescan t)
(iswitchb-make-buflist iswitchb-default)
- (iswitchb-set-matches)
+ (iswitchb-set-matches))
(let
((minibuffer-local-completion-map iswitchb-mode-map)
;; Record the minibuffer depth that we expect to find once
@@ -610,19 +631,29 @@
'(("dummy" . 1)) ;table
nil ;predicate
nil ;require-match [handled elsewhere]
- nil ;initial-contents
+ start ;initial-contents
'iswitchb-history)))
(if (and (not (eq iswitchb-exit 'usefirst))
(get-buffer iswitchb-final-text))
;; This happens for example if the buffer was chosen with the mouse.
- (setq iswitchb-matches (list iswitchb-final-text)))
+ (setq iswitchb-matches (list iswitchb-final-text)
+ iswitchb-virtual-buffers nil))
+
+ ;; If no buffer matched, but a virtual buffer was selected, visit
+ ;; that file now and act as though that buffer had been selected.
+ (if (and iswitchb-virtual-buffers
+ (not (iswitchb-existing-buffer-p)))
+ (let ((virt (car iswitchb-virtual-buffers)))
+ (find-file-noselect (cdr virt))
+ (setq iswitchb-matches (list (car virt))
+ iswitchb-virtual-buffers nil)))
;; Handling the require-match must be done in a better way.
- (if (and require-match (not (iswitchb-existing-buffer-p)))
+ (if (and require-match
+ (not (iswitchb-existing-buffer-p)))
(error "Must specify valid buffer"))
- (if (or
- (eq iswitchb-exit 'takeprompt)
+ (if (or (eq iswitchb-exit 'takeprompt)
(null iswitchb-matches))
(setq buf-sel iswitchb-final-text)
;; else take head of list
@@ -732,18 +762,29 @@
(setq iswitchb-exit 'findfile)
(exit-minibuffer))
+(eval-when-compile
+ (defvar recentf-list))
+
(defun iswitchb-next-match ()
"Put first element of `iswitchb-matches' at the end of the list."
(interactive)
(let ((next (cadr iswitchb-matches)))
- (setq iswitchb-buflist (iswitchb-chop iswitchb-buflist next))
+ (if (and (null next) iswitchb-virtual-buffers)
+ (setq recentf-list
+ (iswitchb-chop recentf-list
+ (cdr (cadr iswitchb-virtual-buffers))))
+ (setq iswitchb-buflist (iswitchb-chop iswitchb-buflist next)))
(setq iswitchb-rescan t)))
(defun iswitchb-prev-match ()
"Put last element of `iswitchb-matches' at the front of the list."
(interactive)
(let ((prev (car (last iswitchb-matches))))
- (setq iswitchb-buflist (iswitchb-chop iswitchb-buflist prev))
+ (if (and (null prev) iswitchb-virtual-buffers)
+ (setq recentf-list
+ (iswitchb-chop recentf-list
+ (cdr (car (last iswitchb-virtual-buffers)))))
+ (setq iswitchb-buflist (iswitchb-chop iswitchb-buflist prev)))
(setq iswitchb-rescan t)))
(defun iswitchb-chop (list elem)
@@ -835,7 +876,8 @@
(setq iswitchb-matches
(let* ((buflist iswitchb-buflist))
(iswitchb-get-matched-buffers iswitchb-text iswitchb-regexp
- buflist)))))
+ buflist))
+ iswitchb-virtual-buffers nil)))
(defun iswitchb-get-matched-buffers (regexp
&optional string-format buffer-list)
@@ -1227,6 +1273,35 @@
first)
(setq comps (cons first (cdr comps)))))
+ ;; If no buffers matched, and virtual buffers are being used, then
+ ;; 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)
+ recentf-list)
+ (setq iswitchb-virtual-buffers nil)
+ (let ((head recentf-list) name)
+ (while head
+ (if (and (setq name (file-name-nondirectory (car head)))
+ (string-match (if iswitchb-regexp
+ iswitchb-text
+ (regexp-quote iswitchb-text)) name)
+ (null (get-file-buffer (car head)))
+ (not (assoc name iswitchb-virtual-buffers))
+ (not (iswitchb-ignore-buffername-p name))
+ (file-exists-p (car head)))
+ (setq iswitchb-virtual-buffers
+ (cons (cons name (car head))
+ 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 'font-lock-builtin-face
+ (car comp))
+ (setq comp (cdr comp))))))
+
(cond ((null comps) (format " %sNo match%s"
open-bracket-determined
close-bracket-determined))
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2004-04-30 11:41 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2004-04-18 11:13 Patch for "virtual buffers" in iswitchb John Wiegley
2004-04-20 21:32 ` John Wiegley
2004-04-30 11:41 ` John Wiegley
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).