[Emacs-diffs] emacs-25 66ff8ba: Fix spurious escapes in describe-input-method

[Paul Eggert]

branch: emacs-25
commit 66ff8bac8ba389bdabca34e70d08743dae4ecda1
Author: Paul Eggert <address@hidden>
Commit: Paul Eggert <address@hidden>

    Fix spurious escapes in describe-input-method
    
    Problem reported by Vincent Belaïche (Bug#22309).
    * lisp/international/mule-cmds.el (describe-language-environment):
    * lisp/international/quail.el (quail-help):
    Apply substitute-command-keys to doc strings before displaying them.
---
 lisp/international/mule-cmds.el |    2 +-
 lisp/international/quail.el     |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lisp/international/mule-cmds.el b/lisp/international/mule-cmds.el
index 79e9c7b..2df847a 100644
--- a/lisp/international/mule-cmds.el
+++ b/lisp/international/mule-cmds.el
@@ -2119,7 +2119,7 @@ See `set-language-info-alist' for use in programs."
       (with-current-buffer standard-output
        (insert language-name " language environment\n\n")
        (if (stringp doc)
-           (insert doc "\n\n"))
+           (insert (substitute-command-keys doc) "\n\n"))
        (condition-case nil
            (let ((str (eval (get-language-info language-name 'sample-text))))
              (if (stringp str)
diff --git a/lisp/international/quail.el b/lisp/international/quail.el
index 75cb7f7..f5e3902 100644
--- a/lisp/international/quail.el
+++ b/lisp/international/quail.el
@@ -2516,7 +2516,7 @@ package to describe."
              ")\n\n")
       (save-restriction
        (narrow-to-region (point) (point))
-       (insert (quail-docstring))
+       (insert (substitute-command-keys (quail-docstring)))
        (goto-char (point-min))
        (with-syntax-table emacs-lisp-mode-syntax-table
          (while (re-search-forward "\\\\<\\sw\\(\\sw\\|\\s_\\)+>" nil t)