Mercurial > emacs
changeset 47114:b0e4184605e5
* ibuffer.el (ibuffer-update): Use `minibufferp'. Expand `caddr'.
* mwheel.el (mouse-wheel-up-button): Doc fix.
author | John Paul Wallington <jpw@pobox.com> |
---|---|
date | Thu, 29 Aug 2002 22:06:26 +0000 |
parents | 72b3185698c4 |
children | 95415d9788e6 |
files | lisp/ChangeLog lisp/ibuffer.el lisp/mwheel.el |
diffstat | 3 files changed, 20 insertions(+), 15 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Thu Aug 29 21:48:50 2002 +0000 +++ b/lisp/ChangeLog Thu Aug 29 22:06:26 2002 +0000 @@ -1,3 +1,9 @@ +2002-08-29 John Paul Wallington <jpw@shootybangbang.com> + + * ibuffer.el (ibuffer-update): Use `minibufferp'. Expand `caddr'. + + * mwheel.el (mouse-wheel-up-button): Doc fix. + 2002-08-29 Juanma Barranquero <lektu@terra.es> * replace.el (occur-mode-hook): New hook. @@ -28,7 +34,7 @@ 2002-08-28 Luc Teirlinck <teirllm@mail.auburn.edu> - * files.el (find-buffer-visiting): Compare file attributes + * files.el (find-buffer-visiting): Compare file attributes using buffer-file-truename. 2002-08-28 Richard M. Stallman <rms@gnu.org>
--- a/lisp/ibuffer.el Thu Aug 29 21:48:50 2002 +0000 +++ b/lisp/ibuffer.el Thu Aug 29 22:06:26 2002 +0000 @@ -2007,18 +2007,17 @@ (ibuffer-forward-line 0) (let* ((bufs (buffer-list)) (blist (ibuffer-filter-buffers - (current-buffer) - (if (and - (cadr bufs) - (eq ibuffer-always-show-last-buffer - :nomini) - ;; This is a hack. - (string-match " \\*Minibuf" - (buffer-name (cadr bufs)))) - (caddr bufs) - (cadr bufs)) - (ibuffer-current-buffers-with-marks bufs) - arg))) + (current-buffer) + (if (and + (cadr bufs) + (eq ibuffer-always-show-last-buffer + :nomini) + (with-current-buffer (cadr bufs) + (minibufferp))) + (car (cddr bufs)) + (cadr bufs)) + (ibuffer-current-buffers-with-marks bufs) + arg))) (when (null blist) (if (and (featurep 'ibuf-ext) ibuffer-filtering-qualifiers)
--- a/lisp/mwheel.el Thu Aug 29 21:48:50 2002 +0000 +++ b/lisp/mwheel.el Thu Aug 29 22:06:26 2002 +0000 @@ -64,7 +64,7 @@ :set 'mouse-wheel-change-button) (defcustom mouse-wheel-up-button 5 - "Obsolete. Use `mouse-whell-up-event'.") + "Obsolete. Use `mouse-wheel-up-event'.") (defcustom mouse-wheel-up-event ;; In the latest versions of XEmacs, we could just use mouse-%s as well. (intern (format (if (featurep 'xemacs) "button%s" "mouse-%s") @@ -133,7 +133,7 @@ mouse-wheel-up-event mouse-wheel-down-event)) x))) - (fset 'mwheel-event-button 'event-button)) + (fset 'mwheel-event-button 'event-button)) (if (not (fboundp 'event-window)) (defun mwheel-event-window (event)