From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Lars Ingebrigtsen Newsgroups: gmane.emacs.bugs Subject: bug#20787: 24.3; make-mode doesn't hightlight macro assignments preceeded by a TAB Date: Tue, 23 Feb 2016 21:07:19 +1100 Message-ID: <87k2lvu4dk.fsf@gnus.org> References: NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1456222107 29815 80.91.229.3 (23 Feb 2016 10:08:27 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 23 Feb 2016 10:08:27 +0000 (UTC) Cc: 20787@debbugs.gnu.org To: "John F. Trudeau" Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Tue Feb 23 11:08:16 2016 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1aY9t6-0005Uc-Gp for geb-bug-gnu-emacs@m.gmane.org; Tue, 23 Feb 2016 11:08:12 +0100 Original-Received: from localhost ([::1]:55635 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aY9t5-0002Dt-Qo for geb-bug-gnu-emacs@m.gmane.org; Tue, 23 Feb 2016 05:08:11 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:42321) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aY9sz-0002Ak-O0 for bug-gnu-emacs@gnu.org; Tue, 23 Feb 2016 05:08:07 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aY9sw-00063d-Aq for bug-gnu-emacs@gnu.org; Tue, 23 Feb 2016 05:08:05 -0500 Original-Received: from debbugs.gnu.org ([208.118.235.43]:42075) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aY9sw-00063Z-6J for bug-gnu-emacs@gnu.org; Tue, 23 Feb 2016 05:08:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84) (envelope-from ) id 1aY9sw-0001hx-0F for bug-gnu-emacs@gnu.org; Tue, 23 Feb 2016 05:08:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Lars Ingebrigtsen Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Tue, 23 Feb 2016 10:08:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 20787 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch Original-Received: via spool by 20787-submit@debbugs.gnu.org id=B20787.14562220706548 (code B ref 20787); Tue, 23 Feb 2016 10:08:01 +0000 Original-Received: (at 20787) by debbugs.gnu.org; 23 Feb 2016 10:07:50 +0000 Original-Received: from localhost ([127.0.0.1]:39202 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84) (envelope-from ) id 1aY9sk-0001hX-GL for submit@debbugs.gnu.org; Tue, 23 Feb 2016 05:07:50 -0500 Original-Received: from hermes.netfonds.no ([80.91.224.195]:58052) by debbugs.gnu.org with esmtp (Exim 4.84) (envelope-from ) id 1aY9si-0001hP-Ji for 20787@debbugs.gnu.org; Tue, 23 Feb 2016 05:07:49 -0500 Original-Received: from cpe-60-225-211-161.nsw.bigpond.net.au ([60.225.211.161] helo=mouse) by hermes.netfonds.no with esmtpsa (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.72) (envelope-from ) id 1aY9sJ-00027j-Hd; Tue, 23 Feb 2016 11:07:24 +0100 In-Reply-To: (John F. Trudeau's message of "Thu, 11 Jun 2015 12:52:53 -0700") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.1.50 (gnu/linux) X-MailScanner-ID: 1aY9sJ-00027j-Hd MailScanner-NULL-Check: 1456826845.17063@1KMKwIR/OlXFutmihTzNLQ 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-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:113554 Archived-At: "John F. Trudeau" writes: > The constant makefile-macroassign-regex (used for highlighting), in > make-mode.el, does not find an assignment that is preceded by a TAB > character. The attached patch corrects the regular expression to allow > TAB as well as SPACE before an assignment, which corrects highlighting. > > -rw-r--r-- trudeajo/users 158 ChangeLog > -rw-r--r-- trudeajo/users 2101 make-mode.el.patch > > This bug has endured through many emacs releases. I've detarred the patch and included it below, but I can't really say whether it makes sense or not. Anybody? diff -C7 -L /home/trudeajo/.emacs.d/lisp/make-mode.el.gz.\~1\~ -L /home/trudeajo/.emacs.d/lisp/make-mode.el.gz /tmp/jka-com58327184q60 /tmp/jka-com58327184pOK *** /home/trudeajo/.emacs.d/lisp/make-mode.el.gz.~1~ --- /home/trudeajo/.emacs.d/lisp/make-mode.el.gz *************** *** 287,301 **** ;; that if you change this regexp you might have to fix the imenu index in ;; makefile-imenu-generic-expression. (defconst makefile-macroassign-regex ;; We used to match not just the varname but also the whole value ;; (spanning potentially several lines). ;; "^ *\\([^ \n\t][^:#= \t\n]*\\)[ \t]*\\(?:!=[ \t]*\\(\\(?:.+\\\\\n\\)*.+\\)\\|[*:+]?[:?]?=[ \t]*\\(\\(?:.*\\\\\n\\)*.*\\)\\)" ;; What about the define statement? What about differentiating this for makepp? ! "\\(?:^\\|^export\\|^override\\|:\\|: *override\\) *\\([^ \n\t][^:#= \t\n]*\\)[ \t]*\\(?:!=\\|[*:+]?[:?]?=\\)" "Regex used to find macro assignment lines in a makefile.") (defconst makefile-var-use-regex "[^$]\\$[({]\\([-a-zA-Z0-9_.]+\\|[@%