bug#38416: 27.0.50; ; [PATCH] * makefile-edit.el: regexp-quote the param in makefile-move-to-macro to avoid error message

bug#38416: 27.0.50; ; [PATCH] * makefile-edit.el: regexp-quote the param in makefile-move-to-macro to avoid error message

[LinSun]

[-- Attachment #1: Type: text/html, Size: 3070 bytes --]

bug#39094: 27.0.50; ; [PATCH] * makefile-edit.el: regexp-quote the param in makefile-move-to-macro to avoid error message

[lin.sun]

[-- Attachment #1: Type: text/plain, Size: 451 bytes --]

Hi Eli,

The attachment is a patch to fix the complaint message from `makefile-move-to-macro' for the param for re-search-forward isn't escaped.
To reproduce the issue, just run follow commands in your shell,
$ echo 'AM_LIBTMP_LIBS:=$(shell X \--libs)' > /tmp/Makefile.am
$ emacs -Q --eval '(progn (global-ede-mode t)(semantic-mode t)(find-file "/tmp/Makefile.am"))'

Could you please review and apply the patch? 
Thank you.

B.R.
Lin Sun

[-- Attachment #2: 0001-Fix-the-error-message-from-makefile-move-to-macro.patch --]
[-- Type: application/octet-stream, Size: 1360 bytes --]

From 9dfa710fd57095cceb025f665e71772f93e6bbe4 Mon Sep 17 00:00:00 2001
From: "lin.sun" <lin.sun@zoom.us>
Date: Fri, 1 Nov 2019 10:25:17 +0800
Subject: [PATCH] Fix the error message from `makefile-move-to-macro'

* makefile-edit.el: regexp-quote the param in makefile-move-to-macro.
With `(global-ede-mode t)' and `(semantic-mode t)' enabled, error
happened when open a Makefile.am which has '$' or '\\' in its macro
list. Simply create a Makefile.am include the line
'AM_LIBTMP_LIBS:=$(shell X \--libs)', open the file with ede and
semantic mode enabled will trigger this issue. Escape the param for
re-search-forward in `makefile-move-to-macro' can fix this.
---
 lisp/cedet/ede/makefile-edit.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lisp/cedet/ede/makefile-edit.el b/lisp/cedet/ede/makefile-edit.el
index 7d8a44b..add1675 100644
--- a/lisp/cedet/ede/makefile-edit.el
+++ b/lisp/cedet/ede/makefile-edit.el
@@ -78,7 +78,7 @@ makefile-move-to-macro
 If NEXT is non-nil, move to the next occurrence of MACRO."
   (let ((oldpt (point)))
     (when (not next) (goto-char (point-min)))
-    (if (re-search-forward (concat "^\\s-*" macro "\\s-*[+:?]?=") nil t)
+    (if (re-search-forward (concat "^\\s-*" (regexp-quote macro) "\\s-*[+:?]?=") nil t)
 	t
       (goto-char oldpt)
       nil)))
-- 
2.2.0

bug#39094: regexp-quote the param in makefile-move-to-macro to avoid error message

[Eli Zaretskii]

> From: Paul Eggert <eggert@cs.ucla.edu>
> Date: Thu, 16 Jan 2020 16:12:01 -0800
> Cc: 39094-done@debbugs.gnu.org
> 
> Thanks for reporting that bug. I installed your patch into the master 
> branch.

Thanks, but such safe bugfixes should go to the release branch.  I've
cherry-picked it now.

bug#38416: Acknowledgement (27.0.50; ; [PATCH] * makefile-edit.el: regexp-quote the param in makefile-move-to-macro to avoid error message)

[lin.sun]

Close this ticket please. 
The original issue is fixed in #39094, both emacs 27.50 and emacs master.

bug#38416: Recall: bug#38416: Acknowledgement (27.0.50; ; [PATCH] * makefile-edit.el: regexp-quote the param in makefile-move-to-macro to avoid error message)

[lin.sun]

[-- Attachment #1: Type: text/plain, Size: 192 bytes --]

lin.sun@zoom.us would like to recall the message, "bug#38416:
Acknowledgement (27.0.50;; [PATCH] * makefile-edit.el: regexp-quote the
param in makefile-move-to-macro to avoid error message)".

[-- Attachment #2: winmail.dat --]
[-- Type: application/ms-tnef, Size: 1813 bytes --]