From: Andreas Schwab <schwab@linux-m68k.org>
Date: Sat, 28 May 2016 08:45:07 +0000 (+0200)
Subject: * lisp/progmodes/elisp-mode.el (elisp-function-argstring): Call
X-Git-Tag: emacs-25.0.95~34
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=f907f98;p=emacs.git

* lisp/progmodes/elisp-mode.el (elisp-function-argstring): Call
substitute-command-keys to undo help--docstring-quote. (Bug#23634)
---

diff --git a/lisp/progmodes/elisp-mode.el b/lisp/progmodes/elisp-mode.el
index 6c6c3803f9e..7ad88712a4d 100644
--- a/lisp/progmodes/elisp-mode.el
+++ b/lisp/progmodes/elisp-mode.el
@@ -1558,7 +1558,8 @@ In the absence of INDEX, just call `eldoc-docstring-format-sym-doc'."
 ARGLIST is either a string, or a list of strings or symbols."
   (let ((str (cond ((stringp arglist) arglist)
                    ((not (listp arglist)) nil)
-                   (t (help--make-usage-docstring 'toto arglist)))))
+                   (t (substitute-command-keys
+                       (help--make-usage-docstring 'toto arglist))))))
     (if (and str (string-match "\\`([^ )]+ ?" str))
         (replace-match "(" t t str)
       str)))