mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-04-23 22:42:01 -07:00
Code Issues Projects Releases Wiki Activity

iswitchb-read-buffer: check that iswitchb-exit is not 'usefirst (set

Browse source 
when user presses RETURN to select buffer) before running:

	;; This happens for example if the buffer was chosen with the mouse.
	(setq iswitchb-matches (list iswitchb-final-text)))


iswitchb-exit-minibuffer: set iswitchb-exit to 'usefirst.

These changes were made to fix the following bug reported by Markus
Rost and John Wiegley:

Evaluate:
(progn
   (iswitchb-mode 1)
   (get-buffer-create "12")
   (get-buffer-create "1")
   (iswitchb-buffer))

You get prompted in the minibuffer.  Type "1".  The minibuffer shows

 iswitch 1{12,1}

Hit RET.  You find yourself in buffer "1" instead of "12", as you
would expect from the documentation.

This bug was introduced when iswitchb-read-buffer was updated to allow
user to select items from the *Completions* buffer with the mouse.
This commit is contained in:
Stephen Eglen 2003-11-25 14:45:32 +00:00
parent 00498bfc92
commit 4dddd07f26
2 changed files with 12 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
lisp/ChangeLog
View file

@ -1,3 +1,10 @@
2003-11-25 Stephen Eglen <stephen@gnu.org>
* iswitchb.el (iswitchb-read-buffer,iswitchb-exit-minibuffer):
iswitchb-exit is set to 'usefirst when user selects buffer at head
of list using RET. (Selecting buffers at the head of the list was
broken if the substring was also a complete buffername.)
2003-11-23 Kim F. Storm <storm@cua.dk>
* progmodes/compile.el (grep-command, grep-use-null-device)

7
lisp/iswitchb.el
View file

@ -610,7 +610,8 @@ If REQUIRE-MATCH is non-nil, an existing-buffer must be selected."
nil ;require-match [handled elsewhere]
nil ;initial-contents
'iswitchb-history)))
(if (get-buffer iswitchb-final-text)
(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)))
@ -712,7 +713,9 @@ The result is stored in `iswitchb-common-match-string'."
(interactive)
(if (or (not iswitchb-require-match)
(iswitchb-existing-buffer-p))
(throw 'exit nil)))
(progn
(setq iswitchb-exit 'usefirst)
(throw 'exit nil))))
(defun iswitchb-select-buffer-text ()
"Select the buffer named by the prompt.