From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: "Trudeau, John" 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 18:21:55 +0000 Message-ID: <2C1A2EF90F50254289D2DED9A26B61090E20FD31@PDCPMBXD405.aeth.aetna.com> References: <87k2lvu4dk.fsf@gnus.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable X-Trace: ger.gmane.org 1456251804 16204 80.91.229.3 (23 Feb 2016 18:23:24 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 23 Feb 2016 18:23:24 +0000 (UTC) Cc: "'20787@debbugs.gnu.org'" <20787@debbugs.gnu.org> To: "'Lars Ingebrigtsen'" Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Tue Feb 23 19:23:13 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 1aYHc9-0006kv-Ag for geb-bug-gnu-emacs@m.gmane.org; Tue, 23 Feb 2016 19:23:13 +0100 Original-Received: from localhost ([::1]:59150 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aYHc8-0002Dw-JU for geb-bug-gnu-emacs@m.gmane.org; Tue, 23 Feb 2016 13:23:12 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:34517) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aYHc1-00029S-Ck for bug-gnu-emacs@gnu.org; Tue, 23 Feb 2016 13:23:06 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aYHby-0006hN-4X for bug-gnu-emacs@gnu.org; Tue, 23 Feb 2016 13:23:05 -0500 Original-Received: from debbugs.gnu.org ([208.118.235.43]:44503) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aYHbx-0006hJ-Tn for bug-gnu-emacs@gnu.org; Tue, 23 Feb 2016 13:23:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84) (envelope-from ) id 1aYHbx-0006JG-OR for bug-gnu-emacs@gnu.org; Tue, 23 Feb 2016 13:23:01 -0500 X-Loop: help-debbugs@gnu.org Resent-From: "Trudeau, John" Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Tue, 23 Feb 2016 18:23: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.145625172824185 (code B ref 20787); Tue, 23 Feb 2016 18:23:01 +0000 Original-Received: (at 20787) by debbugs.gnu.org; 23 Feb 2016 18:22:08 +0000 Original-Received: from localhost ([127.0.0.1]:41630 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84) (envelope-from ) id 1aYHb5-0006I0-OY for submit@debbugs.gnu.org; Tue, 23 Feb 2016 13:22:08 -0500 Original-Received: from mim-1.aetna.com ([206.213.251.44]:45430 helo=vappmtoutboundmf1.aetna.com) by debbugs.gnu.org with esmtp (Exim 4.84) (envelope-from ) id 1aYHb4-0006HY-Gs for 20787@debbugs.gnu.org; Tue, 23 Feb 2016 13:22:07 -0500 Original-Received: from pps.filterd (vappmtoutboundmf1.aetna.com [127.0.0.1]) by vappmtoutboundmf1.aetna.com (8.15.0.59/8.15.0.59) with SMTP id u1NIL5RE030477; Tue, 23 Feb 2016 13:21:57 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=aetna.com; h=from : to : cc : subject : date : message-id : references : in-reply-to : content-type : content-transfer-encoding : mime-version; s=Dec2013; bh=t5BPs/3t6Br5+fIjvIobHmTxpv/tDm8FdrqSgTuUYxo=; b=M2Zh4oDPaGbJGAaOVLKaQoenemQsAS4QFgRtZaTsRvx4c2t0q132zxnpuLvPkOxcmlXO HS+dgPmeT7bQQi4SZLCEKZiHqrM6pBIKa5xos6iDMhNwrT9WSydXLvx7xRJTaZmFxye5 d9pkC1h0xxptVdycJUzv1WXbj5k+tX4djgM= Original-Received: from pvmp-hub-102.aeth.aetna.com (winf5cl11p.aetna.com [167.69.37.19]) by vappmtoutboundmf1.aetna.com with ESMTP id 216kca5dt0-1; Tue, 23 Feb 2016 13:21:57 -0500 Original-Received: from PDCPMBXD405.aeth.aetna.com ([169.254.6.90]) by PVMP-HUB-102.aeth.aetna.com ([10.103.1.52]) with mapi id 14.03.0266.001; Tue, 23 Feb 2016 11:21:56 -0700 Thread-Topic: bug#20787: 24.3; make-mode doesn't hightlight macro assignments preceeded by a TAB Thread-Index: AQHQpIA278DLvzksuEuL08NsdnYn6Z86+yC4gACIyXA= In-Reply-To: <87k2lvu4dk.fsf@gnus.org> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.103.1.101] X-CFilter-Loop: WVMP-VTSPSB-101 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:, , definitions=2016-02-23_10:, , signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 suspectscore=0 malwarescore=0 phishscore=0 adultscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1601100000 definitions=main-1602230198 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:113609 Archived-At: Here is the changed part of the REGEX: Original: *override\\) * New: [ \t]*override\\)[ \t]* This is important for target-specific variable assignment. Change the `SPACES' to `[\t ]' (TAB SPACE). Thanks, John -----Original Message----- From: Lars Ingebrigtsen [mailto:larsi@gnus.org]=20 Sent: Tuesday, February 23, 2016 3:07 AM To: Trudeau, John Cc: 20787@debbugs.gnu.org Subject: Re: bug#20787: 24.3; make-mode doesn't hightlight macro assignment= s preceeded by a TAB "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/tru= deajo/.emacs.d/lisp/make-mode.el.gz /tmp/jka-com58327184q60 /tmp/jka-com583= 27184pOK *** /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][^:#=3D \t\n]*\\)[ \t]*\\(?:!=3D[ \t]*\\(\\(?:.+\\\\\= n\\)*.+\\)\\|[*:+]?[:?]?=3D[ \t]*\\(\\(?:.*\\\\\n\\)*.*\\)\\)" ;; What about the define statement? What about differentiating this fo= r makepp? ! "\\(?:^\\|^export\\|^override\\|:\\|: *override\\) *\\([^ \n\t][^:#=3D = \t\n]*\\)[ \t]*\\(?:!=3D\\|[*:+]?[:?]?=3D\\)" "Regex used to find macro assignment lines in a makefile.") =20=20 (defconst makefile-var-use-regex "[^$]\\$[({]\\([-a-zA-Z0-9_.]+\\|[@%