* ibuffer.el (ibuffer-update): Use `minibufferp'. Expand `caddr'.

* mwheel.el (mouse-wheel-up-button): Doc fix.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 377d317760cae50f217a460851dd0e643f8c5b98..1a20a5dc7288920da51066e229be029758b37a60 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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>

diff --git a/lisp/ibuffer.el b/lisp/ibuffer.el
index 47270d86791c7b1d3e5ece3262610a0ed33fbdba..3e471498096324bc8357828c109b1c1d13f20c4f 100644 (file)
--- a/lisp/ibuffer.el
+++ b/lisp/ibuffer.el
@@ -2007,18 +2007,17 @@ Do not display messages if SILENT is non-nil."
   (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)

diff --git a/lisp/mwheel.el b/lisp/mwheel.el
index ae764f4a69bae172d0f2bd65e2d62d8de93294a3..b2c0c0bddabab8a7cd32dccc1e820543ebd06b79 100644 (file)
--- a/lisp/mwheel.el
+++ b/lisp/mwheel.el
@@ -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 @@ This can be slightly disconcerting, but some people prefer it."
                  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)