aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAndreas Schwab2011-07-15 17:31:36 +0200
committerAndreas Schwab2011-07-15 17:31:36 +0200
commit64348f40105be3d3fdd79662903b74a03edfe544 (patch)
tree822bd0eb3c15b22d8a01cec2ae4266cbd6dcc38c /src
parentab896c37a8440ff1f791b8e0f035bc58f04f5099 (diff)
downloademacs-64348f40105be3d3fdd79662903b74a03edfe544.tar.gz
emacs-64348f40105be3d3fdd79662903b74a03edfe544.zip
* src/doc.c (Fsubstitute_command_keys): Revert last change.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog4
-rw-r--r--src/doc.c4
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 @@
12011-07-15 Andreas Schwab <schwab@linux-m68k.org>
2
3 * doc.c (Fsubstitute_command_keys): Revert last change.
4
12011-07-15 Lars Magne Ingebrigtsen <larsi@gnus.org> 52011-07-15 Lars Magne Ingebrigtsen <larsi@gnus.org>
2 6
3 * doc.c (Fsubstitute_command_keys): Clarify that \= really only 7 * 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
702\(made by `describe-bindings') of the value of MAPVAR, taken as a keymap. 702\(made by `describe-bindings') of the value of MAPVAR, taken as a keymap.
703Substrings of the form \\=\\<MAPVAR> specify to use the value of MAPVAR 703Substrings of the form \\=\\<MAPVAR> specify to use the value of MAPVAR
704as the keymap for future \\=\\[COMMAND] substrings. 704as the keymap for future \\=\\[COMMAND] substrings.
705\\=\\= quotes the following character and is discarded. 705\\=\\= quotes the following character and is discarded;
706In particular, \\=\\=\\ puts \\ into the output. 706thus, \\=\\=\\=\\= puts \\=\\= into the output, and \\=\\=\\=\\[ puts \\=\\[ into the output.
707 707
708Returns original STRING if no substitutions were made. Otherwise, 708Returns original STRING if no substitutions were made. Otherwise,
709a new string, without any text properties, is returned. */) 709a new string, without any text properties, is returned. */)