From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED.blaine.gmane.org!not-for-mail From: "Basil L. Contovounesios" Newsgroups: gmane.emacs.devel Subject: Re: Should diff.elisp.xfuncname match cl-lib macros? Date: Sat, 16 Mar 2019 15:30:22 +0000 Message-ID: <87a7hug7ld.fsf@tcd.ie> References: <87wol0qecg.fsf@tcd.ie> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Injection-Info: blaine.gmane.org; posting-host="blaine.gmane.org:195.159.176.226"; logging-data="95228"; mail-complaints-to="usenet@blaine.gmane.org" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.0.50 (gnu/linux) Cc: emacs-devel@gnu.org To: Stefan Monnier Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Mar 16 16:46:14 2019 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([209.51.188.17]) by blaine.gmane.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:256) (Exim 4.89) (envelope-from ) id 1h5BVl-000Og9-VO for ged-emacs-devel@m.gmane.org; Sat, 16 Mar 2019 16:46:14 +0100 Original-Received: from localhost ([127.0.0.1]:43240 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h5BVl-0001Dn-0N for ged-emacs-devel@m.gmane.org; Sat, 16 Mar 2019 11:46:13 -0400 Original-Received: from eggs.gnu.org ([209.51.188.92]:59575) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h5BT1-0007Sj-Kj for emacs-devel@gnu.org; Sat, 16 Mar 2019 11:43:24 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h5BGV-0007ft-9P for emacs-devel@gnu.org; Sat, 16 Mar 2019 11:30:28 -0400 Original-Received: from mail-ed1-x535.google.com ([2a00:1450:4864:20::535]:33405) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h5BGT-0007ec-PP for emacs-devel@gnu.org; Sat, 16 Mar 2019 11:30:27 -0400 Original-Received: by mail-ed1-x535.google.com with SMTP id q3so3404532edg.0 for ; Sat, 16 Mar 2019 08:30:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tcd-ie.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version; bh=9J/6zxK4DmfNJ1VU1Kc35dhySBt5EQfh2Zq340c1p0I=; b=SbA8s0Ab91WkP8wKpEIeYKKDBjxWTYtg0M8so1lZe+ufUCwYrhJ4JZuX9/TmZX8uzj c6LE83R0xms9xw/FP4Ieb5C+AVe4k7PyHIXyOc9+Qf02KDv2HcNfEmNRqwhBfVZzkRP3 65NQLuFrt6HshUlssbUUmfrHaXib1AwoFus/yxC77HvX1mkXMConc2haSLd2Xhr7CGpm 6qi7ESgwnKybqn6Xpb9J4cywaKRycS9J8zeaClTseYsuCxPnAnlALjfzAj1pAP9md6be jfzYGzN7Q5e0WWQJweEvwmKIRMw359olijW72Da4BXbM+FlRTsINeH8wa3HWD47ZnkGh cR6A== 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=9J/6zxK4DmfNJ1VU1Kc35dhySBt5EQfh2Zq340c1p0I=; b=VLu1jBxA5k9Cu85vV3BVOXHD2l9I50sM875CC7845giMmIYPLPly2KDVT/1tFG1BdZ VRr1PoqLP4j5QTbkNq6ti79c03b90T81F//KNbhhrekf2ah4AQMNICbWydPQUSlLxPO9 s6uAlr6wqtHcmcQe/sWolJcsFzU0Q4/knG7PWxXqqDuWCgcvGJu7O2nqQ0HSZVogNi6E kel5IucSSqK5R/LllprShZe5tXjnGvSg+3U4kjYf49WLehtEGjYr2iZ816oYEdNxf60g 8TCHqZxBfD4Cr0Fm5y49jRxl5gOStqacOdfOukRdTCYPr4T09n4MZFrTpLGHgohfoGpZ 4zNg== X-Gm-Message-State: APjAAAXJu0rI5Xg6hIwuw9gMUgsRo/idoynShyjFbAvQ1+fVzGDvv/V3 +V2zVqiR8MNn2q+kCcS+xmzIWw== X-Google-Smtp-Source: APXvYqzdn4y2pgH+6b//eQej9iX2Jt2qmKSH6y0ynanx0kXlKyJl9RlBn8P8KbUM/u7MWNosaBrx0g== X-Received: by 2002:a17:906:a12:: with SMTP id w18mr5677384ejf.70.1552750224518; Sat, 16 Mar 2019 08:30:24 -0700 (PDT) Original-Received: from localhost ([2a02:8084:20e2:c380:20c2:134e:4f3a:683a]) by smtp.gmail.com with ESMTPSA id 3sm1135393ejx.2.2019.03.16.08.30.23 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Sat, 16 Mar 2019 08:30:23 -0700 (PDT) In-Reply-To: (Stefan Monnier's message of "Fri, 15 Mar 2019 14:21:14 -0400") X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::535 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.21 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.org@gnu.org Original-Sender: "Emacs-devel" Xref: news.gmane.org gmane.emacs.devel:234224 Archived-At: --=-=-= Content-Type: text/plain Stefan Monnier writes: >> Given the increasing presence of cl-defuns, cl-defgenerics, etc. in the >> emacs.git sources, would it be welcome to additionally match cl-lib >> macros? > > Yes, please, I can think of three ways to achieve this given the lack of shy groups in EREs: 0. Match "def" anywhere within the form's name: --=-=-= Content-Type: text/x-diff Content-Disposition: inline; filename=prefix.patch diff --git a/autogen.sh b/autogen.sh index 40d0c37b11..c931103249 100755 --- a/autogen.sh +++ b/autogen.sh @@ -317,7 +317,7 @@ hooks= # Configure 'git diff' hunk header format. git_config diff.elisp.xfuncname \ - '^\(def[^[:space:]]+[[:space:]]+([^()[:space:]]+)' + '^\([^[:space:]]*def[^[:space:]]+[[:space:]]+([^()[:space:]]+)' git_config 'diff.m4.xfuncname' '^((m4_)?define|A._DEFUN(_ONCE)?)\([^),]*' git_config 'diff.make.xfuncname' \ '^([$.[:alnum:]_].*:|[[:alnum:]_]+[[:space:]]*([*:+]?[:?]?|!?)=|define .*)' --=-=-= Content-Type: text/plain 1. Match any column 0 form: --=-=-= Content-Type: text/x-diff Content-Disposition: inline; filename=any.patch diff --git a/autogen.sh b/autogen.sh index 40d0c37b11..860d980c95 100755 --- a/autogen.sh +++ b/autogen.sh @@ -317,7 +317,7 @@ hooks= # Configure 'git diff' hunk header format. git_config diff.elisp.xfuncname \ - '^\(def[^[:space:]]+[[:space:]]+([^()[:space:]]+)' + '^\([^[:space:]]+[[:space:]]+([^()[:space:]]+)' git_config 'diff.m4.xfuncname' '^((m4_)?define|A._DEFUN(_ONCE)?)\([^),]*' git_config 'diff.make.xfuncname' \ '^([$.[:alnum:]_].*:|[[:alnum:]_]+[[:space:]]*([*:+]?[:?]?|!?)=|define .*)' --=-=-= Content-Type: text/plain 1. Capture the whole header line, including the form: --=-=-= Content-Type: text/x-diff Content-Disposition: inline; filename=whole.patch diff --git a/autogen.sh b/autogen.sh index 40d0c37b11..c28c8928ed 100755 --- a/autogen.sh +++ b/autogen.sh @@ -317,7 +317,7 @@ hooks= # Configure 'git diff' hunk header format. git_config diff.elisp.xfuncname \ - '^\(def[^[:space:]]+[[:space:]]+([^()[:space:]]+)' + '^(\((cl-)?def[^[:space:]]+[[:space:]]+[^()[:space:]]+)' git_config 'diff.m4.xfuncname' '^((m4_)?define|A._DEFUN(_ONCE)?)\([^),]*' git_config 'diff.make.xfuncname' \ '^([$.[:alnum:]_].*:|[[:alnum:]_]+[[:space:]]*([*:+]?[:?]?|!?)=|define .*)' --=-=-= Content-Type: text/plain Which is preferred? Is there a better way? Thanks, -- Basil --=-=-=--