diff options
| author | Glenn Morris | 2020-05-06 09:28:36 -0700 |
|---|---|---|
| committer | Glenn Morris | 2020-05-06 09:28:36 -0700 |
| commit | 153241d664f45d832a4564bb53d7f75a0af2c35f (patch) | |
| tree | c8a111f08d8d940ee2b92c71b7525cde2c46e631 | |
| parent | b16d553ecd1b0478ba28dca5d898fd22aa130fd8 (diff) | |
| parent | 76516465bff31d35ea93bcb2badb14c642bb5767 (diff) | |
| download | emacs-153241d664f45d832a4564bb53d7f75a0af2c35f.tar.gz emacs-153241d664f45d832a4564bb53d7f75a0af2c35f.zip | |
Merge from origin/emacs-27
76516465bf (origin/emacs-27) * doc/emacs/modes.texi (Major Modes): Fi...
f8e6cd11b3 Fix docstring quoting
| -rw-r--r-- | doc/emacs/modes.texi | 2 | ||||
| -rw-r--r-- | lisp/gnus/message.el | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/doc/emacs/modes.texi b/doc/emacs/modes.texi index f5fb6b1e797..c1420ea13ff 100644 --- a/doc/emacs/modes.texi +++ b/doc/emacs/modes.texi | |||
| @@ -116,7 +116,7 @@ is enabled in a buffer. @xref{Hooks}, for more information about | |||
| 116 | hooks. Each mode hook is named after its major mode, e.g., Fortran | 116 | hooks. Each mode hook is named after its major mode, e.g., Fortran |
| 117 | mode has @code{fortran-mode-hook}. Furthermore, all text-based major | 117 | mode has @code{fortran-mode-hook}. Furthermore, all text-based major |
| 118 | modes run @code{text-mode-hook}, and many programming language modes | 118 | modes run @code{text-mode-hook}, and many programming language modes |
| 119 | @footnote{More specifically, the modes which are ''derived'' from | 119 | @footnote{More specifically, the modes which are ``derived'' from |
| 120 | @code{prog-mode} (@pxref{Derived Modes,,, elisp, The Emacs Lisp | 120 | @code{prog-mode} (@pxref{Derived Modes,,, elisp, The Emacs Lisp |
| 121 | Reference Manual}).} (including all those distributed with Emacs) run | 121 | Reference Manual}).} (including all those distributed with Emacs) run |
| 122 | @code{prog-mode-hook}, prior to running their own mode hooks. Hook | 122 | @code{prog-mode-hook}, prior to running their own mode hooks. Hook |
diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el index 688091815b8..8f402bfc621 100644 --- a/lisp/gnus/message.el +++ b/lisp/gnus/message.el | |||
| @@ -874,7 +874,7 @@ If this is nil, use `user-mail-address'. If it is the symbol | |||
| 874 | 874 | ||
| 875 | (defcustom message-sendmail-extra-arguments nil | 875 | (defcustom message-sendmail-extra-arguments nil |
| 876 | "Additional arguments to `sendmail-program'. | 876 | "Additional arguments to `sendmail-program'. |
| 877 | A list of strings, e.g. '("-a" "account") for msmtp." | 877 | A list of strings, e.g. (\"-a\" \"account\") for msmtp." |
| 878 | :version "23.1" ;; No Gnus | 878 | :version "23.1" ;; No Gnus |
| 879 | :type '(repeat string) | 879 | :type '(repeat string) |
| 880 | ;; :link '(custom-manual "(message)Mail Variables") | 880 | ;; :link '(custom-manual "(message)Mail Variables") |