1
0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-25 07:28:20 +00:00

* lisp/iswitchb.el (iswitchb-kill-buffer): Avoid `iswitchb-make-buflist'

which changes the order of matches seen by users.

Fixes: debbugs:7231
This commit is contained in:
Leo Liu 2010-10-27 21:30:01 -04:00 committed by Stefan Monnier
parent 77b143ebc1
commit 19677c7126
2 changed files with 16 additions and 4 deletions

View File

@ -1,4 +1,9 @@
2010-10-28 Jes Bodi Klinke <jes@bodi-klinke.dk>
2010-10-28 Leo <sdl.web@gmail.com>
* iswitchb.el (iswitchb-kill-buffer): Avoid `iswitchb-make-buflist'
which changes the order of matches seen by users (bug#7231).
2010-10-28 Jes Bodi Klinke <jes@bodi-klinke.dk> (tiny change)
* progmodes/compile.el (compilation-mode-font-lock-keywords):
Don't confuse -omega as "-o mega".

View File

@ -1033,7 +1033,9 @@ Return the modified list with the last element prepended to it."
(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
@ -1044,8 +1046,13 @@ Return the modified list with the last element prepended to it."
(setq iswitchb-rescan t)
;; Else `kill-buffer' succeeds so re-make the buffer list
;; taking into account packages like uniquify may rename
;; buffers
(iswitchb-make-buflist iswitchb-default))))))
;; 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)