From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Philip Kaludercic Newsgroups: gmane.emacs.devel Subject: Re: master 7e8b1863af8: Add support for deriving major modes in which-func Date: Sat, 10 Feb 2024 16:36:17 +0000 Message-ID: <8734u046pq.fsf@posteo.net> References: <170756342270.29779.1651696549492519525@vcs2.savannah.gnu.org> <20240210111023.1468FC0EFEF@vcs2.savannah.gnu.org> Mime-Version: 1.0 Content-Type: text/plain Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="660"; mail-complaints-to="usenet@ciao.gmane.io" Cc: Damien Cassou To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Sat Feb 10 17:37:03 2024 Return-path: Envelope-to: ged-emacs-devel@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1rYqLf-000AUV-CI for ged-emacs-devel@m.gmane-mx.org; Sat, 10 Feb 2024 17:37:03 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rYqL5-000337-Hz; Sat, 10 Feb 2024 11:36:27 -0500 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rYqL4-00032q-7z for emacs-devel@gnu.org; Sat, 10 Feb 2024 11:36:26 -0500 Original-Received: from mout01.posteo.de ([185.67.36.65]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rYqL0-0004fl-Ay for emacs-devel@gnu.org; Sat, 10 Feb 2024 11:36:25 -0500 Original-Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id BF740240028 for ; Sat, 10 Feb 2024 17:36:18 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1707582978; bh=qJKu41zbTWt6AasMVtZF2SBZLtw0s8VDees3IDEjY3g=; h=From:To:Cc:Subject:Autocrypt:Date:Message-ID:MIME-Version: Content-Type:From; b=HnzKgu/udmPmKBC7/8GU1gCUtlZRW4IqOiknJIOb9RzR+rlo6E0gh7+ZvxojEXHYr ZcrB/4LjZyUz0lu4AYpqLRvK7ZJLAGMCiGDYvI8pAWSwz7TRvsitUbXXiz+wiIz+vd 27un40LZnfDs+JFx3eg68g8buttqPwQKpohXnZ5IGgg4SIouLS2wYDR6MDbOU9S9YF DM6Zr46YGLR86QQPrtb9DVDVixNbfca5vDdxAtrGj77s66UZaJBT0LbB+DWSMGC8YK R9ZAr6XY74b1NZAF4TX4gkFhmmt/ItMjl//YZhcsH01f/tNhzTkErNnc1Q+odoMT/v PPUB7bWRPgoxQ== Original-Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4TXGZB2kJXz6txX; Sat, 10 Feb 2024 17:36:17 +0100 (CET) In-Reply-To: <20240210111023.1468FC0EFEF@vcs2.savannah.gnu.org> (Stefan Kangas's message of "Sat, 10 Feb 2024 06:10:22 -0500 (EST)") X-Hashcash: 1:20:240210:emacs-devel@gnu.org::fcu6Zh3O5mBnLvMg:0wFq X-Hashcash: 1:20:240210:damien@cassou.me::kpzEAH5UR0DalRay:2TRa Autocrypt: addr=philipk@posteo.net; keydata= mDMEZBBQQhYJKwYBBAHaRw8BAQdAHJuofBrfqFh12uQu0Yi7mrl525F28eTmwUDflFNmdui0QlBo aWxpcCBLYWx1ZGVyY2ljIChnZW5lcmF0ZWQgYnkgYXV0b2NyeXB0LmVsKSA8cGhpbGlwa0Bwb3N0 ZW8ubmV0PoiWBBMWCAA+FiEEDg7HY17ghYlni8XN8xYDWXahwukFAmQQUEICGwMFCQHhM4AFCwkI BwIGFQoJCAsCBBYCAwECHgECF4AACgkQ8xYDWXahwulikAEA77hloUiSrXgFkUVJhlKBpLCHUjA0 mWZ9j9w5d08+jVwBAK6c4iGP7j+/PhbkxaEKa4V3MzIl7zJkcNNjHCXmvFcEuDgEZBBQQhIKKwYB BAGXVQEFAQEHQI5NLiLRjZy3OfSt1dhCmFyn+fN/QKELUYQetiaoe+MMAwEIB4h+BBgWCAAmFiEE Dg7HY17ghYlni8XN8xYDWXahwukFAmQQUEICGwwFCQHhM4AACgkQ8xYDWXahwukm+wEA8cml4JpK NeAu65rg+auKrPOP6TP/4YWRCTIvuYDm0joBALw98AMz7/qMHvSCeU/hw9PL6u6R2EScxtpKnWof z4oM Received-SPF: pass client-ip=185.67.36.65; envelope-from=philipk@posteo.net; helo=mout01.posteo.de X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.emacs.devel:316100 Archived-At: Stefan Kangas writes: > branch: master > commit 7e8b1863af8c820c2969c1a4666ae4451cbcea92 > Author: Damien Cassou > Commit: Stefan Kangas > > Add support for deriving major modes in which-func > > * lisp/progmodes/which-func.el (which-func-try-to-enable) > (which-func-ff-hook): Use `derived-mode-p' to check if the current major > mode is within `which-func-modes' or `which-func-non-auto-modes'. > (Bug#68981) > --- > lisp/progmodes/which-func.el | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/lisp/progmodes/which-func.el b/lisp/progmodes/which-func.el > index bd68672f905..631cb3b0aef 100644 > --- a/lisp/progmodes/which-func.el > +++ b/lisp/progmodes/which-func.el > @@ -211,7 +211,7 @@ non-nil.") > (when which-function-mode > (unless (local-variable-p 'which-func-mode) > (setq which-func-mode (or (eq which-func-modes t) > - (member major-mode which-func-modes))) > + (apply #'derived-mode-p which-func-modes))) Isn't the `apply' here unnecessary, since the argument to `derived-mode-p' can be a symbol or a list. Invoking the function with multiple arguments appears to be deprecated anyway. > (setq which-func--use-mode-line > (member which-func-display '(mode mode-and-header))) > (setq which-func--use-header-line > @@ -239,7 +239,7 @@ It creates the Imenu index for the buffer, if necessary." > > (condition-case err > (if (and which-func-mode > - (not (member major-mode which-func-non-auto-modes)) > + (not (apply #'derived-mode-p which-func-non-auto-modes)) > (or (null which-func-maxout) > (< buffer-saved-size which-func-maxout) > (= which-func-maxout 0))) > > -- Philip Kaludercic