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: Tue, 18 Sep 2018 02:44:28 +0900 Message-ID: <87sh2881dv.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> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: blaine.gmane.org 1537206190 2289 195.159.176.226 (17 Sep 2018 17:43:10 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Mon, 17 Sep 2018 17:43:10 +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 Mon Sep 17 19:43:06 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 1g1xY9-0000TT-0X for geb-bug-gnu-emacs@m.gmane.org; Mon, 17 Sep 2018 19:43:05 +0200 Original-Received: from localhost ([::1]:36816 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g1xaF-0002Xv-CO for geb-bug-gnu-emacs@m.gmane.org; Mon, 17 Sep 2018 13:45:15 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:45317) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g1xa8-0002V8-CN for bug-gnu-emacs@gnu.org; Mon, 17 Sep 2018 13:45:09 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1g1xa2-0008BQ-5F for bug-gnu-emacs@gnu.org; Mon, 17 Sep 2018 13:45:08 -0400 Original-Received: from debbugs.gnu.org ([208.118.235.43]:39074) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1g1xa1-0008B9-WA for bug-gnu-emacs@gnu.org; Mon, 17 Sep 2018 13:45:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1g1xa1-0002bm-Pb for bug-gnu-emacs@gnu.org; Mon, 17 Sep 2018 13:45: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: Mon, 17 Sep 2018 17:45: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.15372062859987 (code B ref 32731); Mon, 17 Sep 2018 17:45:01 +0000 Original-Received: (at 32731) by debbugs.gnu.org; 17 Sep 2018 17:44:45 +0000 Original-Received: from localhost ([127.0.0.1]:43332 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1g1xZk-0002b0-HN for submit@debbugs.gnu.org; Mon, 17 Sep 2018 13:44:44 -0400 Original-Received: from mail-wr1-f53.google.com ([209.85.221.53]:42113) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1g1xZi-0002am-0P for 32731@debbugs.gnu.org; Mon, 17 Sep 2018 13:44:42 -0400 Original-Received: by mail-wr1-f53.google.com with SMTP id v17-v6so18203473wrr.9 for <32731@debbugs.gnu.org>; Mon, 17 Sep 2018 10:44:41 -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=WeIq6JU/1YbX86IjSN2lFRm0J1STII5R/KO4UTGUTuk=; b=HkC1DWY2xYDBqlESgnsp+a2MmpFkibsOzgkKccNP5tzzeRI4Yx1rmXgaYvz3iHEF2t L1+L6b27L5krAB7Aa+5NmRlUOrdntqOisjFALMIvj34MA6cAred7ycxiqS/3PEX2sPss Gar3D0+NQF94Stp3EQkqL02lD4xjlR/k6cX4+P6tQ3rb5guH7/76a7htx28HN7hg+pBH RHrwAvjT22qnPRi1fxUjjz4DIoIDPb5PYCs0j4whxnh13+kpoCDShQ7UQ6+3qWNOi//+ sZCLeNuKQZAvGHh4wIwXuYr2eArlJEZbIYHN4lgQs88Tz/3FmT3txG0DY3W3oDDauUU5 fztA== 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=WeIq6JU/1YbX86IjSN2lFRm0J1STII5R/KO4UTGUTuk=; b=CCFpwUKgtdxiTnzpLWF6jeFdDBn4hWpsofSM3M0rDsoXQP8gIqe7l5/d/szk+9nTXt R07/UwvJNrBPArDUJLMObb0kPfnnBYfHUQIPl9UVwWsZU219XTdE1CW7aYrsvyoWSbO3 N/J74LEwm3yqMLozQSdqdeLsF43dEAcywWPH9L4Il3RspSyIdbIx7hYRpHZi7ZfeyaQd 80Kbv8F8xcriq+VQLn05LzqXRvUJ1votXIj6pwhT4YwOEQOPTRLMYB8DDVPjU6Wx3ZLq /vi6a1mD+A42OSZIwLapS1BhwRkni4tOAVIcMu1x8POBXMXxj/mtnBsDzVNkOtwRELip GUCg== X-Gm-Message-State: APzg51BI4P5WfEb1+goqe3Lxs/R/JJODko9BEkn6rCObPQVe7BUvKIKE ELIDr6x+vK/PclmkP6LAR0eXxW+h X-Google-Smtp-Source: ANB0VdYUxI/MHa5wG14MhEJejQ8MqqcqUv9JpZZrSejSEz//k0kO5xV3BZP+SS1ZXpJOOUAf589Amg== X-Received: by 2002:adf:e1c5:: with SMTP id l5-v6mr20619886wri.36.1537206274620; Mon, 17 Sep 2018 10:44:34 -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 y184-v6sm7261889wmg.17.2018.09.17.10.44.33 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 17 Sep 2018 10:44:33 -0700 (PDT) In-Reply-To: <878t43rkxd.fsf@gmail.com> (Noam Postavsky's message of "Sat, 15 Sep 2018 08:42:54 -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:150376 Archived-At: Noam Postavsky writes: >Shouldn't this patch be going into master anyway (since it's adding a >new feature)? I think is pretty tiny and safe new feature. We can ask Eli anyway [probably he is reading this right now :-)] >> + (cond ((null (cdr modes)) (ibuffer-filter-by-used-mode (car modes))) >> + (t (let ((composed-filter > > We should handle the (null modes) case too, but otherwise looks good to > me. Yeah, that's right. * 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? * Why just 'used modes' and not the other 2 mode filters benefit from this feature? Because I just use that filter, i.e. '/ m'. A bit selfish. Please take a look in following patch. * It allows filtering by >1 mode with the 3 mode filters. * It moves most of the code inside the macro `define-ibuffer-filter'; no need to add new functions. --8<-----------------------------cut here---------------start------------->8--- commit 2079d7b656cef1e1d2c03f3c7e0c93ec135f348d Author: Tino Calancha Date: Tue Sep 18 02:19:54 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-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. * lisp/ibuf-macs.el(define-ibuffer-filter): Adjust it to handle QUALIFIER been a list of symbols. * 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..2b0292f2de 100644 --- a/lisp/ibuf-ext.el +++ b/lisp/ibuf-ext.el @@ -1228,28 +1228,33 @@ 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))) + (lambda (e) + (string-match "-mode\\'" (if (symbolp e) (symbol-name e) e))) t nil nil default)))) (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,8 +1262,8 @@ 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: ") @@ -1267,11 +1272,13 @@ used-mode ;;;###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))) (with-current-buffer buf (derived-mode-p qualifier))) diff --git a/lisp/ibuf-macs.el b/lisp/ibuf-macs.el index 6a70a8341a..7893ec9cae 100644 --- a/lisp/ibuf-macs.el +++ b/lisp/ibuf-macs.el @@ -296,21 +296,34 @@ 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)) + ;; The mode filters accept one symbol or a list of symbols; if the + ;; user inputs >1 mode, compose the individual filters with `or'. + ,(when (memq name (list 'mode 'used-mode 'derived-mode)) + `(progn + (unless (listp qualifier) (setq qualifier (list qualifier))) + ;; Reject equivalent filters: (or m1 m2) is same as (or m2 m1). + (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) + (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---