[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master e58a815: Fix quoting when making derived mode docst
From: |
Paul Eggert |
Subject: |
[Emacs-diffs] master e58a815: Fix quoting when making derived mode docstring |
Date: |
Mon, 15 Jun 2015 19:41:30 +0000 |
branch: master
commit e58a815339fe77f184da8e71e3b932a46b2c0433
Author: Paul Eggert <address@hidden>
Commit: Paul Eggert <address@hidden>
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 files 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)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] master e58a815: Fix quoting when making derived mode docstring,
Paul Eggert <=