From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Tino Calancha Newsgroups: gmane.emacs.bugs Subject: bug#32731: 26.1.50; Ibuffer filter by mode: Handle >1 mode names Date: Wed, 19 Sep 2018 18:23:52 +0900 Message-ID: <877ejh96xj.fsf@calancha-pc.dy.bbexcite.jp> References: <87bm919s5y.fsf@calancha-pc.dy.bbexcite.jp> <874let9lps.fsf@calancha-pc.dy.bbexcite.jp> <87ftydezmi.fsf@gmail.com> <87worn86l5.fsf@calancha-pc.dy.bbexcite.jp> <878t43rkxd.fsf@gmail.com> <87sh2881dv.fsf@calancha-pc.dy.bbexcite.jp> <871s9qqtq1.fsf@gmail.com> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: blaine.gmane.org 1537348987 15826 195.159.176.226 (19 Sep 2018 09:23:07 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Wed, 19 Sep 2018 09:23:07 +0000 (UTC) User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.0.50 (gnu/linux) Cc: 32731@debbugs.gnu.org To: Noam Postavsky Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Wed Sep 19 11:23:02 2018 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by blaine.gmane.org with esmtp (Exim 4.84_2) (envelope-from ) id 1g2YhK-00042S-G7 for geb-bug-gnu-emacs@m.gmane.org; Wed, 19 Sep 2018 11:23:02 +0200 Original-Received: from localhost ([::1]:44417 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g2YjQ-0003qz-Uu for geb-bug-gnu-emacs@m.gmane.org; Wed, 19 Sep 2018 05:25:12 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:34169) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g2YjK-0003qr-5I for bug-gnu-emacs@gnu.org; Wed, 19 Sep 2018 05:25:07 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1g2YjG-00018z-2W for bug-gnu-emacs@gnu.org; Wed, 19 Sep 2018 05:25:06 -0400 Original-Received: from debbugs.gnu.org ([208.118.235.43]:40883) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1g2YjF-00018a-Ss for bug-gnu-emacs@gnu.org; Wed, 19 Sep 2018 05:25:01 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1g2YjF-0000aR-Of for bug-gnu-emacs@gnu.org; Wed, 19 Sep 2018 05:25:01 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Tino Calancha Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Wed, 19 Sep 2018 09:25:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 32731 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: Original-Received: via spool by 32731-submit@debbugs.gnu.org id=B32731.15373490472175 (code B ref 32731); Wed, 19 Sep 2018 09:25:01 +0000 Original-Received: (at 32731) by debbugs.gnu.org; 19 Sep 2018 09:24:07 +0000 Original-Received: from localhost ([127.0.0.1]:45141 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1g2YiN-0000Z0-5i for submit@debbugs.gnu.org; Wed, 19 Sep 2018 05:24:07 -0400 Original-Received: from mail-wm1-f53.google.com ([209.85.128.53]:35741) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1g2YiL-0000YW-Fj for 32731@debbugs.gnu.org; Wed, 19 Sep 2018 05:24:05 -0400 Original-Received: by mail-wm1-f53.google.com with SMTP id o18-v6so6064020wmc.0 for <32731@debbugs.gnu.org>; Wed, 19 Sep 2018 02:24:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version; bh=CBq0AJlyf6+QbwRnR2f4k0cNFWjYodX/2nVH4ZgxwC0=; b=p+Ok5v1wWvQi++nndoJzglcVeS9VFsogmFKYby2lNukCsPZNLIvnuQYlJHxYpXqVYZ cGXBHvcFi4T6LR8TIf9AhoJV4rgGczk2GseEKSxI0t0tkCmZbx83LuObeQNi215OfbVs VqHbYqo7H61UvSzeLSfKEOVjj3pbX/TUUuuzouW3MG1d1Otw2K7DvF1599XkOzDquoyc wBHCdzJlc6TZrEIu76TbGFf6fqnxiQBJkG1HIn9E1k6J57bDQzdVp4ARdBjQwF2/gZzp ZYhJpzDC1aXK809JXLqD+pcc6XzXWNFrNY425Fxc/p4CwtYBjeTlQyQQGS9ALEo1xSfx 2xYQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version; bh=CBq0AJlyf6+QbwRnR2f4k0cNFWjYodX/2nVH4ZgxwC0=; b=L9stW/r/ryjtP71GFChZygTRkUSVMwQO2RjlplEUZh/nrP0gC+G7/DDyx7pq44VYXM 6jDD6ZVp9/JT8fqqLfBzDcR4GE9EI30GKeAfl6KHBSsMLoXsnfpnZXLrv2RbFnSdQIDZ 32uil8q4qWjZSOwLfUWiffhD4wbn2qwEkoxsZl5RJRTduNWLT6Evi/qiKwTugXojlhvX 2i8WeSiowVDgYx0nAoH0DbGHiPWFfqXceMMZXrxziWzHzzNLQSs1YuFLvaH0u3IS4jEA LsLXvwaQwbRvb0lphr4jJ+Q9KNTY3DZmEEYACH5H81bkWbgcTGPzoe8gpww0Z/KubEHZ 1Ldw== X-Gm-Message-State: APzg51BWXSmlxwaMp7okPT8fsw84x+QsSbI83AstIwoNgy4vaJLY4Y25 biRRdTCNTu4LURecMwo0N9465go8 X-Google-Smtp-Source: ANB0VdaUAeQrBFq7o/bkAKHmdTmpNugpSRSo8QVicZ2RSuUFXrRykUk18P7OB6DwLDTI1Nk8lkNtwg== X-Received: by 2002:a1c:e581:: with SMTP id c123-v6mr19736082wmh.85.1537349039271; Wed, 19 Sep 2018 02:23:59 -0700 (PDT) Original-Received: from calancha-pc.dy.bbexcite.jp (15.red-83-50-151.dynamicip.rima-tde.net. [83.50.151.15]) by smtp.gmail.com with ESMTPSA id d4-v6sm553072wrw.70.2018.09.19.02.23.57 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 19 Sep 2018 02:23:58 -0700 (PDT) In-Reply-To: <871s9qqtq1.fsf@gmail.com> (Noam Postavsky's message of "Tue, 18 Sep 2018 19:19:34 -0400") X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 208.118.235.43 X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Original-Sender: "bug-gnu-emacs" Xref: news.gmane.org gmane.emacs.bugs:150446 Archived-At: Noam Postavsky writes: > Tino Calancha writes: > >> * I don't like much such new function >> `ibuffer-filter-by-used-modes': isn't it better that >> `ibuffer-filter-by-used-mode' handles both inputs? > > In principle, I agree with this, but there is a drawback to be aware of: > fancier completion modes (e.g., icomplete, ido, etc) don't support > completing-read-multiple. So users of those modes could see this as a > regression. OK. Annotaded here for the records. >> * It moves most of the code inside the macro `define-ibuffer-filter'; no >> need to add new functions. > > I don't like that define-ibuffer-filter has special code for certain > filter types. Me either, but I don't like code duplication either: Macros are a convenient way to avoid that. Unless you have something sound in mind... Following patch adds a key :composable, which also serves as documentation. --8<-----------------------------cut here---------------start------------->8--- commit 5c6092b172209cb0261f36f423f508bddc4d0dcd Author: Tino Calancha Date: Wed Sep 19 18:08:35 2018 +0900 Ibuffer filter by modes: Accept several mode names Extend all mode filters so that they handle >1 mode. For instance, if the user wants to filter all buffers in C or C++ mode, then s?he can call the filter interactively with input: 'c-mode,c++-mode'. * lisp/ibuf-macs.el(define-ibuffer-filter): Add key :composable. If the value of this key is non-nil, then the filter accepts a single qualifier or a list of them; in the latter case, the resultant filter is the `or' composition of the individual ones. * lisp/ibuf-ext.el (ibuffer-filter-by-used-mode) (ibuffer-filter-by-mode, ibuffer-filter-by-derived-mode) Accept a mode name or a list of mode names. Interactively, accept a comma separated list of mode names. Set :composable value non-nil. * etc/NEWS(Ibuffer): Announce this change. Co-authored-by: Noam Postavsky diff --git a/etc/NEWS b/etc/NEWS index fa93112c91..43d9a38b91 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -62,6 +62,10 @@ to reduce differences between developer and production builds. ** Ibuffer --- +*** All mode filters accept a symbol or a list of symbols, i.e., you +can filter several major modes with easy. + +--- *** New toggle 'ibuffer-do-toggle-lock', bound to 'L'. ** Gnus diff --git a/lisp/ibuf-ext.el b/lisp/ibuf-ext.el index d9949d2835..fc2e21a77f 100644 --- a/lisp/ibuf-ext.el +++ b/lisp/ibuf-ext.el @@ -1228,28 +1228,34 @@ ibuffer-list-buffer-modes ;;;###autoload (autoload 'ibuffer-filter-by-mode "ibuf-ext") (define-ibuffer-filter mode - "Limit current view to buffers with major mode QUALIFIER." + "Limit current view to buffers with major mode in QUALIFIER. +QUALIFIER is the mode name as a symbol or a list of symbols. +Called interactively, accept a comma separated list of mode names." (:description "major mode" :reader (let* ((buf (ibuffer-current-buffer)) (default (if (and buf (buffer-live-p buf)) (symbol-name (buffer-local-value 'major-mode buf))))) - (intern - (completing-read + (mapcar #'intern + (completing-read-multiple (if default (format "Filter by major mode (default %s): " default) "Filter by major mode: ") obarray - #'(lambda (e) - (string-match "-mode\\'" (symbol-name e))) - t nil nil default)))) + (lambda (e) + (string-match "-mode\\'" (if (symbolp e) (symbol-name e) e))) + t nil nil default))) + :composable t) (eq qualifier (buffer-local-value 'major-mode buf))) ;;;###autoload (autoload 'ibuffer-filter-by-used-mode "ibuf-ext") (define-ibuffer-filter used-mode - "Limit current view to buffers with major mode QUALIFIER. -Called interactively, this function allows selection of modes + "Limit current view to buffers with major mode in QUALIFIER. +QUALIFIER is the mode name as a symbol or a list of symbols. + +Called interactively, accept a comma separated list of mode names. +When called interactively, this function allows selection of modes currently used by buffers." (:description "major mode in use" :reader @@ -1257,23 +1263,27 @@ used-mode (default (if (and buf (buffer-live-p buf)) (symbol-name (buffer-local-value 'major-mode buf))))) - (intern - (completing-read + (mapcar #'intern + (completing-read-multiple (if default (format "Filter by major mode (default %s): " default) "Filter by major mode: ") - (ibuffer-list-buffer-modes) nil t nil nil default)))) + (ibuffer-list-buffer-modes) nil t nil nil default))) + :composable t) (eq qualifier (buffer-local-value 'major-mode buf))) ;;;###autoload (autoload 'ibuffer-filter-by-derived-mode "ibuf-ext") (define-ibuffer-filter derived-mode - "Limit current view to buffers whose major mode inherits from QUALIFIER." + "Limit current view to buffers whose major mode inherits from QUALIFIER. +QUALIFIER is the mode name as a symbol or a list of symbols. +Called interactively, accept a comma separated list of mode names." (:description "derived mode" :reader - (intern - (completing-read "Filter by derived mode: " + (mapcar #'intern + (completing-read-multiple "Filter by derived mode: " (ibuffer-list-buffer-modes t) - nil t))) + nil t)) + :composable t) (with-current-buffer buf (derived-mode-p qualifier))) ;;;###autoload (autoload 'ibuffer-filter-by-name "ibuf-ext") diff --git a/lisp/ibuf-macs.el b/lisp/ibuf-macs.el index 6a70a8341a..1030096ec1 100644 --- a/lisp/ibuf-macs.el +++ b/lisp/ibuf-macs.el @@ -282,12 +282,16 @@ ibuffer-save-marks (cl-defmacro define-ibuffer-filter (name documentation (&key reader - description) + description + composable) &rest body) "Define a filter named NAME. DOCUMENTATION is the documentation of the function. READER is a form which should read a qualifier from the user. DESCRIPTION is a short string describing the filter. +COMPOSABLE is a boolean; if non-nil, the filter accepts both, +a single condition or a list of them; in the latter +case the filter is the `or' composition of the conditions. BODY should contain forms which will be evaluated to test whether or not a particular buffer should be displayed or not. The forms in BODY @@ -296,21 +300,32 @@ ibuffer-save-marks \(fn NAME DOCUMENTATION (&key READER DESCRIPTION) &rest BODY)" (declare (indent 2) (doc-string 2)) - (let ((fn-name (intern (concat "ibuffer-filter-by-" (symbol-name name))))) + (let ((fn-name (intern (concat "ibuffer-filter-by-" (symbol-name name)))) + (filter (make-symbol "ibuffer-filter")) + (qualifier-str (make-symbol "ibuffer-qualifier-str"))) `(progn (defun ,fn-name (qualifier) ,(or documentation "This filter is not documented.") (interactive (list ,reader)) - (if (null (ibuffer-push-filter (cons ',name qualifier))) - (message "%s" - (format ,(concat (format "Filter by %s already applied: " description) - " %s") - qualifier)) - (message "%s" - (format ,(concat (format "Filter by %s added: " description) - " %s") - qualifier)) - (ibuffer-update nil t))) + (let ((,filter (cons ',name qualifier)) + (,qualifier-str qualifier)) + ,(when composable + `(progn + (unless (listp qualifier) (setq qualifier (list qualifier))) + ;; Reject equivalent filters: (or f1 f2) is same as (or f2 f1). + (setq qualifier (sort (delete-dups qualifier) #'string-lessp)) + (setq ,filter (cons ',name (car qualifier))) + (setq ,qualifier-str + (mapconcat (lambda (m) (if (symbolp m) (symbol-name m) m)) + qualifier ",")) + (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) + (ibuffer-update nil t)))) (push (list ',name ,description (lambda (buf qualifier) (condition-case nil --8<-----------------------------cut here---------------end--------------->8---