summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/ibuffer.el7
2 files changed, 8 insertions, 4 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 55e6dfb0f50..0db75714768 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2012-03-11 Christopher Schmidt <christopher@ch.ristopher.com>
+
+ * ibuffer.el (ibuffer-redisplay): Remove gratuitous error
+ (Bug#10987).
+
2012-03-11 Chong Yidong <cyd@gnu.org>
* simple.el (goto-line): Doc fix (Bug#9938).
diff --git a/lisp/ibuffer.el b/lisp/ibuffer.el
index 17be5534138..7db4cc49ed7 100644
--- a/lisp/ibuffer.el
+++ b/lisp/ibuffer.el
@@ -2140,11 +2140,10 @@ If optional arg SILENT is non-nil, do not display progress messages."
(unless silent
(message "Redisplaying current buffer list..."))
(let ((blist (ibuffer-current-state-list)))
- (when (null blist)
- (if (and (featurep 'ibuf-ext)
+ (when (and (null blist)
+ (featurep 'ibuf-ext)
(or ibuffer-filtering-qualifiers ibuffer-hidden-filter-groups))
- (message "No buffers! (note: filtering in effect)")
- (error "No buffers!")))
+ (message "No buffers! (note: filtering in effect)"))
(ibuffer-redisplay-engine blist t)
(unless silent
(message "Redisplaying current buffer list...done"))