Re: master 1ba0149 1/2: Fix curved quotes in a few places

Re: master 1ba0149 1/2: Fix curved quotes in a few places

[Artur Malabarba]

> --- a/lisp/emacs-lisp/derived.el
> +++ b/lisp/emacs-lisp/derived.el
> @@ -331,7 +331,8 @@ 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))
> +                      (if (string-match (regexp-quote (format "[`‘]%s['’]"
> +                                                               parent))
>                                          docstring) nil
>                          (format "`%s' " parent))
>                        "might have run,\nthis mode "))

Is this correct?
I think this regexp-quote was used in case “parent” contains special
characters, but now it's also quoting the [`'] part (which I think is
an accident).

_______________________________________________
Emacs-diffs mailing list
Emacs-diffs@gnu.org
https://lists.gnu.org/mailman/listinfo/emacs-diffs

Re: [Emacs-diffs] master 1ba0149 1/2: Fix curved quotes in a few places

[Paul Eggert]

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

Artur Malabarba wrote:

> I think this regexp-quote was used in case “parent” contains special
> characters, but now it's also quoting the [`'] part (which I think is
> an accident).

Thanks for catching that.  I installed the attached to fix it.


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-Fix-quoting-when-making-derived-mode-docstring.patch --]
[-- Type: text/x-diff; name="0001-Fix-quoting-when-making-derived-mode-docstring.patch", Size: 1361 bytes --]

From 9c7c31b96e9cec4454d33eacc070577ad5541d66 Mon Sep 17 00:00:00 2001
From: Paul Eggert <eggert@cs.ucla.edu>
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