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

From: <[email-masked]>
Date: Fri, 1 Nov 2019 10:59:44 +0800

[PATCH] * makefile-edit.el: regexp-quote the param in
makefile-move-to-macro.

Fix the error message from `makefile-move-to-macro' when there is '$'
or '\\' in param for re-search-forward, with `(global-ede-mode t)' and
`(semantic-mode t)'. Enable ede and semantic mode, then open a
Makefile.am in which has line 'AM_LIBTMP_LIBS:=$(shell X \--libs)'
will trigger this issue.
---
 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