diff options
| author | Glenn Morris <rgm@gnu.org> | 2019-02-20 12:07:22 -0800 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2019-02-20 12:07:22 -0800 |
| commit | 83a9133e35827c1edbd8bf24a17ffa3b4bfb7be3 (patch) | |
| tree | 11d2812db4a9ee4e66976b3a5f1e5ecbe52b4955 /lisp/mail/supercite.el | |
| parent | ae77728d14e58054bdaee3c6965979947c778208 (diff) | |
| parent | ff9c9620794e5fe5692cfd3badd207aac78921cb (diff) | |
| download | emacs-83a9133e35827c1edbd8bf24a17ffa3b4bfb7be3.tar.gz | |
Merge from origin/emacs-26
ff9c962 ; * lisp/ldefs-boot.el: Update.
b4a251c * ; ChangeLog.3 update
d3104e3 * etc/AUTHORS: Update.
a19bfb7 Remove .art from the default list of ImageMagick extensions
6985caa Fix input after setting x-wait-for-event-timeout nil
715388a Fix two warnings in eshell.texi
d49cdd9 * lisp/minibuffer.el (completion-table-dynamic): Improve docs...
5dc4e51 * lisp/emacs-lisp/debug.el (debug-on-variable-change): Doc fi...
76ef805 Fix a typo in ELisp manual
b5e66f4 Update citations of Internet RFCs
57ece2a Fix handling of manpage references divided by hyphenation
7ad0cd6 * doc/misc/eshell.texi: Fix some @ref's.
12b7940 Fix a typo in lispref/syntax.texi
# Conflicts:
# lisp/gnus/nnrss.el
# lisp/mail/ietf-drums.el
Diffstat (limited to 'lisp/mail/supercite.el')
| -rw-r--r-- | lisp/mail/supercite.el | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lisp/mail/supercite.el b/lisp/mail/supercite.el index 10c61cb65ab..ad69dca8c43 100644 --- a/lisp/mail/supercite.el +++ b/lisp/mail/supercite.el @@ -315,7 +315,7 @@ during the initial citing via `sc-cite-original'." :group 'supercite-hooks) (defcustom sc-mail-warn-if-non-rfc822-p t - "Warn if mail headers don't conform to RFC822." + "Warn if mail headers don't conform to RFC 822 (or later)." :type 'boolean :group 'supercite-attr) (defcustom sc-mumble "" @@ -738,10 +738,10 @@ If optional ATTRIBS-P is non-nil, the key/value pair is placed in nil) (defun sc-mail-error-in-mail-field () - "Issue warning that mail headers don't conform to RFC 822." + "Issue warning that mail headers don't conform to email RFCs." (let* ((len (min (length curline) 10)) (ellipsis (if (< len (length curline)) "..." "")) - (msg "Mail header \"%s%s\" doesn't conform to RFC 822. skipping...")) + (msg "Mail header \"%s%s\" doesn't conform to RFC 822 (or later). skipping...")) (message msg (substring curline 0 len) ellipsis)) (beep) (sit-for 2) |