[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r105449: Avoid deleting ibuffer named
From: |
Chong Yidong |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r105449: Avoid deleting ibuffer named filters by default. |
Date: |
Sun, 14 Aug 2011 14:08:20 -0400 |
User-agent: |
Bazaar (2.3.1) |
------------------------------------------------------------
revno: 105449
fixes bug(s): http://debbugs.gnu.org/8804
committer: Chong Yidong <address@hidden>
branch nick: trunk
timestamp: Sun 2011-08-14 14:08:20 -0400
message:
Avoid deleting ibuffer named filters by default.
* lisp/ibuf-ext.el (ibuffer-filter-disable): New arg for deleting
filter groups.
(ibuffer-included-in-filter-p-1): Use it. Suggested by Noam
Postavsky.
modified:
lisp/ChangeLog
lisp/ibuf-ext.el
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2011-08-14 05:11:36 +0000
+++ b/lisp/ChangeLog 2011-08-14 18:08:20 +0000
@@ -1,3 +1,10 @@
+2011-08-14 Chong Yidong <address@hidden>
+
+ * ibuf-ext.el (ibuffer-filter-disable): New arg for deleting
+ filter groups.
+ (ibuffer-included-in-filter-p-1): Use it. Suggested by Noam
+ Postavsky (Bug#8804).
+
2011-08-12 Juanma Barranquero <address@hidden>
* startup.el (argi): Declare as global variable (bug#9275).
=== modified file 'lisp/ibuf-ext.el'
--- a/lisp/ibuf-ext.el 2011-04-19 13:44:55 +0000
+++ b/lisp/ibuf-ext.el 2011-08-14 18:08:20 +0000
@@ -505,7 +505,7 @@
(assoc (cdr filter)
ibuffer-saved-filters)))
(unless data
- (ibuffer-filter-disable)
+ (ibuffer-filter-disable t)
(error "Unknown saved filter %s" (cdr filter)))
(ibuffer-included-in-filters-p buf (cadr data))))
(t
@@ -514,7 +514,7 @@
;; filterdat should be like (TYPE DESCRIPTION FUNC)
;; just a sanity check
(unless filterdat
- (ibuffer-filter-disable)
+ (ibuffer-filter-disable t)
(error "Undefined filter %s" (car filter)))
(not
(not
@@ -768,11 +768,14 @@
(ibuffer-update nil t))
;;;###autoload
-(defun ibuffer-filter-disable ()
- "Disable all filters currently in effect in this buffer."
+(defun ibuffer-filter-disable (&optional delete-filter-groups)
+ "Disable all filters currently in effect in this buffer.
+With optional arg DELETE-FILTER-GROUPS non-nil, delete all filter
+group definitions by setting `ibuffer-filter-groups' to nil."
(interactive)
- (setq ibuffer-filtering-qualifiers nil
- ibuffer-filter-groups nil)
+ (setq ibuffer-filtering-qualifiers nil)
+ (if delete-filter-groups
+ (setq ibuffer-filter-groups nil))
(let ((buf (ibuffer-current-buffer)))
(ibuffer-update nil t)
(when buf
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r105449: Avoid deleting ibuffer named filters by default.,
Chong Yidong <=