diff options
| author | Glenn Morris | 2020-04-05 07:50:15 -0700 |
|---|---|---|
| committer | Glenn Morris | 2020-04-05 07:50:15 -0700 |
| commit | 333f63d53706de9d1a1dbc04ed62f9dc0e9698db (patch) | |
| tree | 8384df145897e7845c3ef738d9b27ff35c63fbf3 /doc | |
| parent | 0e18fdd1b6e86b8b9704e3a73204f94682ee9450 (diff) | |
| parent | 6de20c7eab0dd8360e78d744dbf62aecc7f78281 (diff) | |
| download | emacs-333f63d53706de9d1a1dbc04ed62f9dc0e9698db.tar.gz emacs-333f63d53706de9d1a1dbc04ed62f9dc0e9698db.zip | |
Merge from origin/emacs-27
6de20c7eab (origin/emacs-27) Fix syntax error in man page.
f8607d3c03 Handle filling of indented ChangeLog function entries
7e78f0d1b2 Fix void-variable n-reb in re-builder (Bug#40409)
452d776a5d Fix small bug in copy_string_contents.
fa823653ff Fix invocations of gpg from Gnus
d4f51d0a2e Don't draw GTK's internal border and tab bar on top of eac...
38731d504e ; * src/buffer.c (syms_of_buffer) <inhibit-read-only>: Doc...
44ac9e48bb Tweak htmlfontify's generated output
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/man/emacs.1.in | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/man/emacs.1.in b/doc/man/emacs.1.in index e1190cf4604..5a164e98cd3 100644 --- a/doc/man/emacs.1.in +++ b/doc/man/emacs.1.in | |||
| @@ -171,7 +171,7 @@ The editor will send messages to stderr. | |||
| 171 | You must use \-l and \-f options to specify files to execute | 171 | You must use \-l and \-f options to specify files to execute |
| 172 | and functions to call. | 172 | and functions to call. |
| 173 | .TP | 173 | .TP |
| 174 | .BI \-\-script= "file" | 174 | .BI \-\-script " file" |
| 175 | Run | 175 | Run |
| 176 | .I file | 176 | .I file |
| 177 | as an Emacs Lisp script. | 177 | as an Emacs Lisp script. |