diff options
| author | Paul Eggert | 2016-01-18 23:09:15 -0800 |
|---|---|---|
| committer | Paul Eggert | 2016-01-18 23:09:42 -0800 |
| commit | 66ff8bac8ba389bdabca34e70d08743dae4ecda1 (patch) | |
| tree | a944d6136f11f449ebb2761b6a87ebd19b285a67 | |
| parent | 2e5a89fad151f8efa97aea3f400823a95bee6289 (diff) | |
| download | emacs-66ff8bac8ba389bdabca34e70d08743dae4ecda1.tar.gz emacs-66ff8bac8ba389bdabca34e70d08743dae4ecda1.zip | |
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.
| -rw-r--r-- | lisp/international/mule-cmds.el | 2 | ||||
| -rw-r--r-- | 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 79e9c7b4adc..2df847acc25 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." | |||
| 2119 | (with-current-buffer standard-output | 2119 | (with-current-buffer standard-output |
| 2120 | (insert language-name " language environment\n\n") | 2120 | (insert language-name " language environment\n\n") |
| 2121 | (if (stringp doc) | 2121 | (if (stringp doc) |
| 2122 | (insert doc "\n\n")) | 2122 | (insert (substitute-command-keys doc) "\n\n")) |
| 2123 | (condition-case nil | 2123 | (condition-case nil |
| 2124 | (let ((str (eval (get-language-info language-name 'sample-text)))) | 2124 | (let ((str (eval (get-language-info language-name 'sample-text)))) |
| 2125 | (if (stringp str) | 2125 | (if (stringp str) |
diff --git a/lisp/international/quail.el b/lisp/international/quail.el index 75cb7f787df..f5e390278ca 100644 --- a/lisp/international/quail.el +++ b/lisp/international/quail.el | |||
| @@ -2516,7 +2516,7 @@ package to describe." | |||
| 2516 | ")\n\n") | 2516 | ")\n\n") |
| 2517 | (save-restriction | 2517 | (save-restriction |
| 2518 | (narrow-to-region (point) (point)) | 2518 | (narrow-to-region (point) (point)) |
| 2519 | (insert (quail-docstring)) | 2519 | (insert (substitute-command-keys (quail-docstring))) |
| 2520 | (goto-char (point-min)) | 2520 | (goto-char (point-min)) |
| 2521 | (with-syntax-table emacs-lisp-mode-syntax-table | 2521 | (with-syntax-table emacs-lisp-mode-syntax-table |
| 2522 | (while (re-search-forward "\\\\<\\sw\\(\\sw\\|\\s_\\)+>" nil t) | 2522 | (while (re-search-forward "\\\\<\\sw\\(\\sw\\|\\s_\\)+>" nil t) |