diff options
| author | Paul Eggert | 2016-05-05 23:11:11 -0700 |
|---|---|---|
| committer | Paul Eggert | 2016-05-05 23:11:11 -0700 |
| commit | 89ce83b20249dfb4e45f09dfdddf4c4b66d82968 (patch) | |
| tree | 3d75245a5514df2ad7b17ae6d56727b9629846a9 /src/doprnt.c | |
| parent | d546ed13b04521308ef7ec8e7e5b68e03f1bbb38 (diff) | |
| parent | 50650cb6887d99b01eeb1e686fc1f695c2a0c64a (diff) | |
| download | emacs-89ce83b20249dfb4e45f09dfdddf4c4b66d82968.tar.gz emacs-89ce83b20249dfb4e45f09dfdddf4c4b66d82968.zip | |
Merge from origin/emacs-25
50650cb Doc fixes for fclist and grep
5e814e0 Minor doc fixes for quoting
3347a73 `nreverse' the marker pairs list
1a4127d Use save-excursion in xref-location-marker more
ab3ba91 shell-quote-argument DIR when appropriate
922c7a3 Rework xref-query-replace-in-results
3fe3510 * lisp/replace.el (query-replace-read-from): Use minibuffer-w...
0932b94 Fix todo-mode bug involving archived items (bug#23447)
e68ad1f ; * etc/NEWS: Tiny edit. (Bug#23432)
adc80b7 ; * test/automated/xref-tests.el: Add copyright and license.
4d8fd9c Handle "empty line" regexp in xref searches
f559b37 Add tests for xref-collect-matches
6428aa0 Use grep-find-ignored-directories instead of vc-directory-exc...
6f82d8e Clear buffer-undo-list when showing xrefs
c68a091 Note the quote translation in `message' in section "incompati...
52f86a7 * etc/NEWS: Mention (message "%s" (format ...)).
93703c5 (Common Keywords): Correct what missing :group means
79e5800 Improve documentation of Dired's 'A' and 'Q' commands
2ea2a2f Doc fixes for quoting
8544b98 posnp doc clarification
805204f Mention what a missing :group does
ec554d7 Fix documentation of dired-aux search/replace commands
Diffstat (limited to 'src/doprnt.c')
| -rw-r--r-- | src/doprnt.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/doprnt.c b/src/doprnt.c index 506bbc3df35..9d8b783565f 100644 --- a/src/doprnt.c +++ b/src/doprnt.c | |||
| @@ -46,15 +46,15 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 46 | ignored %s and %c conversions. (See below for the detailed documentation of | 46 | ignored %s and %c conversions. (See below for the detailed documentation of |
| 47 | what is supported.) However, this is okay, as this function is supposed to | 47 | what is supported.) However, this is okay, as this function is supposed to |
| 48 | be called from `error' and similar functions, and thus does not need to | 48 | be called from `error' and similar functions, and thus does not need to |
| 49 | support features beyond those in `Fformat', which is used by `error' on the | 49 | support features beyond those in `Fformat_message', which is used |
| 50 | Lisp level. */ | 50 | by `error' on the Lisp level. */ |
| 51 | 51 | ||
| 52 | /* In the FORMAT argument this function supports ` and ' as directives | 52 | /* In the FORMAT argument this function supports ` and ' as directives |
| 53 | that output left and right quotes as per ‘text-quoting style’. It | 53 | that output left and right quotes as per ‘text-quoting style’. It |
| 54 | also supports the following %-sequences: | 54 | also supports the following %-sequences: |
| 55 | 55 | ||
| 56 | %s means print a string argument. | 56 | %s means print a string argument. |
| 57 | %S is silently treated as %s, for loose compatibility with `Fformat'. | 57 | %S is treated as %s, for loose compatibility with `Fformat_message'. |
| 58 | %d means print a `signed int' argument in decimal. | 58 | %d means print a `signed int' argument in decimal. |
| 59 | %o means print an `unsigned int' argument in octal. | 59 | %o means print an `unsigned int' argument in octal. |
| 60 | %x means print an `unsigned int' argument in hex. | 60 | %x means print an `unsigned int' argument in hex. |