diff options
| author | Lars Magne Ingebrigtsen | 2011-07-15 16:31:14 +0200 |
|---|---|---|
| committer | Lars Magne Ingebrigtsen | 2011-07-15 16:31:14 +0200 |
| commit | f863868c450935385e5483c2e170fa7eb5799327 (patch) | |
| tree | 136e22af7afe6df9ff64d7daf0258948136e6ed5 | |
| parent | 3aa5f34b9ba4b34132ae8f971c5820175f868489 (diff) | |
| download | emacs-f863868c450935385e5483c2e170fa7eb5799327.tar.gz emacs-f863868c450935385e5483c2e170fa7eb5799327.zip | |
Clarify that \= only quotes the next character
| -rw-r--r-- | doc/lispref/ChangeLog | 4 | ||||
| -rw-r--r-- | doc/lispref/help.texi | 5 | ||||
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/doc.c | 4 |
4 files changed, 12 insertions, 5 deletions
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog index cf6e3482efb..d18a72ef6d7 100644 --- a/doc/lispref/ChangeLog +++ b/doc/lispref/ChangeLog | |||
| @@ -1,5 +1,9 @@ | |||
| 1 | 2011-07-15 Lars Magne Ingebrigtsen <larsi@gnus.org> | 1 | 2011-07-15 Lars Magne Ingebrigtsen <larsi@gnus.org> |
| 2 | 2 | ||
| 3 | * help.texi (Keys in Documentation): Clarify that \= only quotes | ||
| 4 | the next character, and doesn't affect longer sequences in | ||
| 5 | particular (bug#8935). | ||
| 6 | |||
| 3 | * debugging.texi (Using Debugger): Mention | 7 | * debugging.texi (Using Debugger): Mention |
| 4 | @code{eval-expression-debug-on-error} (bug#8549). | 8 | @code{eval-expression-debug-on-error} (bug#8549). |
| 5 | 9 | ||
diff --git a/doc/lispref/help.texi b/doc/lispref/help.texi index 0ce05d55a07..4e5bb1b247c 100644 --- a/doc/lispref/help.texi +++ b/doc/lispref/help.texi | |||
| @@ -324,9 +324,8 @@ specifies @var{mapvar}'s value as the keymap for any following | |||
| 324 | @samp{\[@var{command}]} sequences in this documentation string. | 324 | @samp{\[@var{command}]} sequences in this documentation string. |
| 325 | 325 | ||
| 326 | @item \= | 326 | @item \= |
| 327 | quotes the following character and is discarded; thus, @samp{\=\[} puts | 327 | quotes the following character and is discarded; thus, @samp{\=\} puts |
| 328 | @samp{\[} into the output, and @samp{\=\=} puts @samp{\=} into the | 328 | @samp{\} into the output. |
| 329 | output. | ||
| 330 | @end table | 329 | @end table |
| 331 | 330 | ||
| 332 | @strong{Please note:} Each @samp{\} must be doubled when written in a | 331 | @strong{Please note:} Each @samp{\} must be doubled when written in a |
diff --git a/src/ChangeLog b/src/ChangeLog index 8ef3efa8a52..75de3e44123 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,5 +1,9 @@ | |||
| 1 | 2011-07-15 Lars Magne Ingebrigtsen <larsi@gnus.org> | 1 | 2011-07-15 Lars Magne Ingebrigtsen <larsi@gnus.org> |
| 2 | 2 | ||
| 3 | * doc.c (Fsubstitute_command_keys): Clarify that \= really only | ||
| 4 | quotes the next character, and doesn't affect other longer | ||
| 5 | sequences (bug#8935). | ||
| 6 | |||
| 3 | * lread.c (syms_of_lread): Clarify that is isn't only | 7 | * lread.c (syms_of_lread): Clarify that is isn't only |
| 4 | `eval-buffer' and `eval-defun' that's affected by | 8 | `eval-buffer' and `eval-defun' that's affected by |
| 5 | `lexical-binding' (bug#8460). | 9 | `lexical-binding' (bug#8460). |
| @@ -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. |
| 703 | Substrings of the form \\=\\<MAPVAR> specify to use the value of MAPVAR | 703 | Substrings of the form \\=\\<MAPVAR> specify to use the value of MAPVAR |
| 704 | as the keymap for future \\=\\[COMMAND] substrings. | 704 | as the keymap for future \\=\\[COMMAND] substrings. |
| 705 | \\=\\= quotes the following character and is discarded; | 705 | \\=\\= quotes the following character and is discarded. |
| 706 | thus, \\=\\=\\=\\= puts \\=\\= into the output, and \\=\\=\\=\\[ puts \\=\\[ into the output. | 706 | In particular, \\=\\=\\ puts \\ into the output. |
| 707 | 707 | ||
| 708 | Returns original STRING if no substitutions were made. Otherwise, | 708 | Returns original STRING if no substitutions were made. Otherwise, |
| 709 | a new string, without any text properties, is returned. */) | 709 | a new string, without any text properties, is returned. */) |