diff options
| author | Andreas Schwab <schwab@linux-m68k.org> | 2011-07-15 17:31:36 +0200 |
|---|---|---|
| committer | Andreas Schwab <schwab@linux-m68k.org> | 2011-07-15 17:31:36 +0200 |
| commit | 64348f40105be3d3fdd79662903b74a03edfe544 (patch) | |
| tree | 822bd0eb3c15b22d8a01cec2ae4266cbd6dcc38c | |
| parent | ab896c37a8440ff1f791b8e0f035bc58f04f5099 (diff) | |
| download | emacs-64348f40105be3d3fdd79662903b74a03edfe544.tar.gz | |
* src/doc.c (Fsubstitute_command_keys): Revert last change.
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/doc.c | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 75de3e44123..8b9f2935347 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2011-07-15 Andreas Schwab <schwab@linux-m68k.org> + + * doc.c (Fsubstitute_command_keys): Revert last change. + 2011-07-15 Lars Magne Ingebrigtsen <larsi@gnus.org> * doc.c (Fsubstitute_command_keys): Clarify that \= really only diff --git a/src/doc.c b/src/doc.c index 5a8dc3ce37c..69646f5af51 100644 --- a/src/doc.c +++ b/src/doc.c @@ -702,8 +702,8 @@ Substrings of the form \\=\\{MAPVAR} are replaced by summaries \(made by `describe-bindings') of the value of MAPVAR, taken as a keymap. Substrings of the form \\=\\<MAPVAR> specify to use the value of MAPVAR as the keymap for future \\=\\[COMMAND] substrings. -\\=\\= quotes the following character and is discarded. -In particular, \\=\\=\\ puts \\ into the output. +\\=\\= quotes the following character and is discarded; +thus, \\=\\=\\=\\= puts \\=\\= into the output, and \\=\\=\\=\\[ puts \\=\\[ into the output. Returns original STRING if no substitutions were made. Otherwise, a new string, without any text properties, is returned. */) |