diff options
| author | Glenn Morris <rgm@gnu.org> | 2020-01-28 07:50:22 -0800 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2020-01-28 07:50:22 -0800 |
| commit | 60a3c5d56c5684913e1ae77464d7c9e71bc04560 (patch) | |
| tree | eff936192f906634481b5035a93cb138a2a4f005 /src | |
| parent | 5ee3c37634f7f8651b2da1f4b611334a2b146928 (diff) | |
| parent | 1bcac29b2f9980bf47f64217a3b6be5979051fe6 (diff) | |
| download | emacs-60a3c5d56c5684913e1ae77464d7c9e71bc04560.tar.gz | |
Merge from origin/emacs-27
1bcac29b2f (origin/emacs-27) dns-mode-soa-auto-increment-serial: safe...
abf0f8666d * lisp/wdired.el: Clean out isearch-filter-predicate (bug#...
c31c31e57f ; Spelling and URL fixes
066aad7b9d Finish the documentation for c-noise-macro-{,with-parens-}...
c8fcabf245 Correct regexp for flags in `format' doc string
2e9a153b26 Moderate recommendation to escape '(' in doc strings
d7cd4ab7d9 Objective C Mode: Make c-forward-type work with "unsigned ...
1705e32ebc Fix help text about configure module support
baca81e641 * doc/lispref/streams.texi (Output Functions): Improve ind...
568a560fce Improve doc string of 'newline'
7f50698505 Improve doc of eq on bignums etc.
e5327a569c Do not refer to obsolete alias
fd09196781 ; Clarify what time-stamp-active enables
# Conflicts:
# etc/NEWS
Diffstat (limited to 'src')
| -rw-r--r-- | src/callproc.c | 2 | ||||
| -rw-r--r-- | src/editfns.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/callproc.c b/src/callproc.c index 6bd4ae22f63..07dcc4c3ae4 100644 --- a/src/callproc.c +++ b/src/callproc.c @@ -794,7 +794,7 @@ call_process (ptrdiff_t nargs, Lisp_Object *args, int filefd, signal_after_change hasn't. A continue statement restarts the enclosing while (1) loop. A second, unwanted, call to `prepare_to_modify_buffer' is inhibited - by the test perpared_pos < PT. The data are inserted + by the test prepared_pos < PT. The data are inserted again, and this time signal_after_change gets called, balancing the previous call to prepare_to_modify_buffer. */ if ((prepared_pos < PT) && nread) diff --git a/src/editfns.c b/src/editfns.c index 4e35784e554..3f1b3aa4b75 100644 --- a/src/editfns.c +++ b/src/editfns.c @@ -3031,7 +3031,7 @@ width, and precision specifiers, as follows: %<field><flags><width><precision>character where field is [0-9]+ followed by a literal dollar "$", flags is -[+ #-0]+, width is [0-9]+, and precision is a literal period "." +[+ #0-]+, width is [0-9]+, and precision is a literal period "." followed by [0-9]+. If a %-sequence is numbered with a field with positive value N, the |