>From 9c7c31b96e9cec4454d33eacc070577ad5541d66 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Mon, 15 Jun 2015 12:40:32 -0700 Subject: [PATCH] Fix quoting when making derived mode docstring * lisp/emacs-lisp/derived.el (derived-mode-make-docstring): Nest regexp-quote inside format, not the reverse. Problem reported by Artur Malabarba in: http://lists.gnu.org/archive/html/emacs-devel/2015-06/msg00206.html --- lisp/emacs-lisp/derived.el | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/lisp/emacs-lisp/derived.el b/lisp/emacs-lisp/derived.el index 75bd325..52ff2aa 100644 --- a/lisp/emacs-lisp/derived.el +++ b/lisp/emacs-lisp/derived.el @@ -331,9 +331,10 @@ which more-or-less shadow%s %s's corresponding table%s." "\n\nThis mode " (concat "\n\nIn addition to any hooks its parent mode " - (if (string-match (regexp-quote (format "[`‘]%s['’]" - parent)) - docstring) nil + (if (string-match (format "[`‘]%s['’]" + (regexp-quote parent)) + docstring) + nil (format "`%s' " parent)) "might have run,\nthis mode ")) (format "runs the hook `%s'" hook) -- 2.1.0