diff options
| author | Manuel Giraud <manuel@ledu-giraud.fr> | 2022-06-15 17:52:38 +0200 |
|---|---|---|
| committer | Lars Ingebrigtsen <larsi@gnus.org> | 2022-06-15 17:52:38 +0200 |
| commit | b105981803302dd1eccb06fcc19bd18eec4a4311 (patch) | |
| tree | 2490eff58bde37ada3914a7179ec18d56f09a5eb | |
| parent | ebdda80b0733f67cca58380fd28aa08db06f11ff (diff) | |
| download | emacs-b105981803302dd1eccb06fcc19bd18eec4a4311.tar.gz emacs-b105981803302dd1eccb06fcc19bd18eec4a4311.tar.bz2 emacs-b105981803302dd1eccb06fcc19bd18eec4a4311.zip | |
Do not display 'nil for 0-ary filter qualifier in ibuf
* lisp/ibuf-ext.el (ibuffer-format-qualifier-1): Do not display
nil in header for 0-ary filter qualifier.
* lisp/ibuf-macs.el (define-ibuffer-filter): Also fix the message.
| -rw-r--r-- | lisp/ibuf-ext.el | 4 | ||||
| -rw-r--r-- | lisp/ibuf-macs.el | 13 |
2 files changed, 12 insertions, 5 deletions
diff --git a/lisp/ibuf-ext.el b/lisp/ibuf-ext.el index 30b494f5733..822ecbdd99d 100644 --- a/lisp/ibuf-ext.el +++ b/lisp/ibuf-ext.el @@ -1211,7 +1211,9 @@ Interactively, prompt for NAME, and use the current filters." (let ((type (assq (car qualifier) ibuffer-filtering-alist))) (unless qualifier (error "Ibuffer: Bad qualifier %s" qualifier)) - (concat " [" (cadr type) ": " (format "%s]" (cdr qualifier))))))) + (if (cdr qualifier) + (format " [%s: %s]" (cadr type) (cdr qualifier)) + (format " [%s]" (cadr type))))))) (defun ibuffer-list-buffer-modes (&optional include-parents) "Create a completion table of buffer modes currently in use. diff --git a/lisp/ibuf-macs.el b/lisp/ibuf-macs.el index 5d2dd479455..51b206d7c48 100644 --- a/lisp/ibuf-macs.el +++ b/lisp/ibuf-macs.el @@ -321,10 +321,15 @@ bound to the current value of the filter. (when (cdr qualifier) ; Compose individual filters with `or'. (setq ,filter `(or ,@(mapcar (lambda (m) (cons ',name m)) qualifier)))))) (if (null (ibuffer-push-filter ,filter)) - (message ,(format "Filter by %s already applied: %%s" description) - ,qualifier-str) - (message ,(format "Filter by %s added: %%s" description) - ,qualifier-str) + (if ,qualifier-str + (message ,(format "Filter by %s already applied: %%s" + description) + ,qualifier-str) + (message ,(format "Filter by %s already applied" description))) + (if ,qualifier-str + (message ,(format "Filter by %s added: %%s" description) + ,qualifier-str) + (message ,(format "Filter by %s added" description))) (ibuffer-update nil t)))) (push (list ',name ,description (lambda (buf qualifier) |