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

43 files changed, 749 insertions, 206 deletions

diff --git a/ChangeLog.3 b/ChangeLog.3
index 70d1b8f8d92..6c5d9c27a0d 100644
--- a/ChangeLog.3
+++ b/ChangeLog.3
@@ -1,3 +1,498 @@
+2019-02-20  Glenn Morris  <rgm@gnu.org>
+
+        Remove .art from the default list of ImageMagick extensions
+
+        It seems that .art files can be non-image files that
+        ImageMagick mistakenly treats as extremely large images.
+        Real .art images seem rare.
+        * lisp/image.el (imagemagick-enabled-types): Remove ART.  (Bug#22289)
+
+2019-02-19  Eli Zaretskii  <eliz@gnu.org>
+
+        Fix input after setting x-wait-for-event-timeout nil
+
+        * src/w32term.c (x_make_frame_visible): Call unblock_input
+        before returning early.  (Bug#34575)
+
+2019-02-19  Martin Rudalics  <rudalics@gmx.at>
+
+        Fix two warnings in eshell.texi
+
+        * doc/misc/eshell.texi (Built-ins, Globbing): Fix `.' or `,'
+        must follow @xref, not `f' warnings.
+
+2019-02-18  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * lisp/minibuffer.el (completion-table-dynamic): Improve docstring
+
+2019-02-18  David Pathakjee  <dpathakjee@gmail.com>  (tiny change)
+
+        * lisp/emacs-lisp/debug.el (debug-on-variable-change): Doc fix.  (Bug#34518)
+
+2019-02-17  Eli Zaretskii  <eliz@gnu.org>
+
+        Fix a typo in ELisp manual
+
+        * doc/lispref/abbrevs.texi (Abbrev Table Properties): Fix a
+        typo.  (Bug#34508)
+
+2019-02-16  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Update citations of Internet RFCs
+
+        For example, RFC 822 has been obsoleted by RFC 2822, which in
+        turn has been obsoleted by RFC 5322.
+        * doc/emacs/ack.texi, doc/lispref/os.texi:
+        * doc/misc/emacs-mime.texi, doc/misc/gnus-coding.texi:
+        * doc/misc/gnus.texi, doc/misc/sc.texi:
+        * lisp/calendar/parse-time.el, lisp/gnus/gnus-cite.el:
+        * lisp/gnus/gnus-util.el, lisp/gnus/message.el:
+        * lisp/gnus/mm-bodies.el, lisp/gnus/nnrss.el:
+        * lisp/mail/feedmail.el, lisp/mail/ietf-drums.el:
+        * lisp/mail/mail-extr.el, lisp/mail/mail-utils.el:
+        * lisp/mail/mailclient.el, lisp/mail/mailheader.el:
+        * lisp/mail/rfc2047.el, lisp/mail/rfc822.el, lisp/mail/rmail.el:
+        * lisp/mail/sendmail.el, lisp/mail/smtpmail.el:
+        * lisp/mail/supercite.el, lisp/mh-e/mh-e.el:
+        * lisp/mh-e/mh-utils.el, lisp/net/imap.el:
+        * lisp/net/newst-backend.el, lisp/org/org-id.el:
+        * lisp/ps-samp.el, lisp/simple.el, lisp/url/url-util.el:
+        Update RFC citations.
+
+2019-02-16  Eli Zaretskii  <eliz@gnu.org>
+
+        Fix handling of manpage references divided by hyphenation
+
+        * lisp/man.el (Man-reference-regexp): Accept a newline as part
+        of a manpage name only if it's preceded by a hyphen.  (Bug#34286)
+        (Man-translate-references): Adapt to change in
+        'Man-reference-regexp'.
+        (Man-default-man-entry): Support references divided between
+        two lines by an ASCII hyphen.  This is a left-over from fixing
+        bug#6289.
+
+2019-02-16  Gregor Zattler  <telegraph@gmx.net>  (tiny change)
+
+        * doc/misc/eshell.texi: Fix some @ref's.
+
+2019-02-16  Eli Zaretskii  <eliz@gnu.org>
+
+        Fix a typo in lispref/syntax.texi
+
+        * doc/lispref/syntax.texi (Syntax Table Internals): Fix a
+        typo.  (Bug#34495)
+
+2019-02-15  Victor J. Orlikowski  <vjo@duke.edu>  (tiny change)
+
+        Avoid errors in erc-dcc.el when erc-dcc-verbose is non-nil
+
+        * lisp/erc/erc-dcc.el (erc-dcc-get-filter): Don't assume STR
+        is always a string.  Use 'buffer-name' to get the DCC file
+        name, as buffer-file-name is not set in the process buffer.
+
+2019-02-15  Daniel Lopez  <daniel.lopez999@gmail.com>  (tiny change)
+
+        Fix faces in compilation messages
+
+        * lisp/progmodes/compile.el (compilation-parse-errors): Don't
+        clobber the value of TYPE inside the loop.  (Bug#34479)
+
+2019-02-15  Gregor Zattler  <telegraph@gmx.net>
+
+        * doc/misc/eshell.texi (Built-ins): Fix alias description
+
+        Dear eamcs developers, eshells current documentation first states
+        that alias definitions are not saved to an alias file, later that
+        they are saved to an alias file.  I tested it and the latter is
+        correct.
+
+        Please find attached a patch which fixes this.
+
+        Thanks for working on emacs which is really great, Gregor
+
+        >From 1fe51cc769ab7a30d0896fb3d6105c0561243fa7 Mon Sep 17 00:00:00 2001
+        From: Gregor Zattler <telegraph@gmx.net>
+        Date: Wed, 13 Feb 2019 20:19:38 +0100
+        Subject: * doc/misc/eshell.texi (Built-ins): Fix alias description.
+
+        Bring description of built-in 'alias' in line with (info "(eshell) Aliases"),
+        which describes the actual behaviur.
+
+        (cherry picked from commit a48099ce7ff63cda416a870766fe61f5b8ac7c2c)
+
+2019-02-14  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+        Work for empty MIME attachments (related to bug#34387)
+
+        * lisp/gnus/mm-view.el (mm-inline-text):
+        Make undisplayer do nothing if the part is empty.
+
+        * lisp/gnus/mm-decode.el (mm-copy-to-buffer): Work for empty MIME part.
+        * lisp/gnus/mml.el (mime-to-mml): Ditto.
+
+2019-02-14  Jackson Ray Hamilton  <jackson@jacksonrayhamilton.com>
+
+        Backport: js-indent-align-list-continuation: Make variable safe
+
+        * lisp/progmodes/js.el (js-indent-align-list-continuation): Indicate
+        variable is safe as a file-local variable.  This fixes the
+        js-indent-align-list-continuation-nil test when run with make.
+
+        (cherry picked from commit dd319f2711f895eec87c1017b82cd9d88d9ecd0a)
+
+2019-02-13  Eli Zaretskii  <eliz@gnu.org>
+
+        Avoid crashes upon C-g in nested invocations of 'read_char'
+
+        * src/keyboard.c (read_char, read_event_from_main_queue):
+        Ensure the global value of getcjmp is restored when the stack
+        is unwound by the likes of 'throw', by calling
+        record_unwind_protect_ptr instead of restoring the value
+        manually.  (Bug#34394)
+        (restore_getcjmp): Argument is now 'void *', to match the
+        signature of record_unwind_protect_ptr.
+
+        (cherry picked from commit 10527fca66e39d7067986904161fa33741abcd26)
+
+2019-02-12  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * src/data.c (Fmake_local_variable): Fix bug#34318
+
+        Revert part of ed962f2b8a.
+
+        * test/src/data-tests.el (data-tests-make-local-forwarded-var):
+        Add corresponding test.
+
+2019-02-12  Eli Zaretskii  <eliz@gnu.org>
+
+        Minor fixes in ELisp manual wrt syntax-table properties
+
+        * doc/lispref/syntax.texi (Syntax Properties): Fix reference
+        to syntax-table properties.  (Bug#34455)
+        (Control Parsing): Remove redundant @vindex entry.
+
+2019-02-12  Michael Albinus  <michael.albinus@gmx.de>
+
+        * admin/notes/emba: New file.
+
+2019-02-11  Eli Zaretskii  <eliz@gnu.org>
+
+        Fix Hunspell invocation for discovering its dictionaries
+
+        * lisp/textmodes/ispell.el
+        (ispell-find-hunspell-dictionaries): Invoke Hunspell with the
+        -a switch, to prevent it from initializing its curses UI.
+        (Bug#34272)
+
+2019-02-08  Eli Zaretskii  <eliz@gnu.org>
+
+        Minor improvements to do strings in callproc.c
+
+        * src/callproc.c (Fcall_process, Fcall_process_region): Minor
+        fixes to doc strings.  Suggested by Nicholas Drozd
+        <nicholasdrozd@gmail.com>.  (Bug#34274)
+
+2019-02-08  Eli Zaretskii  <eliz@gnu.org>
+
+        Improve documentation of 'date-to-time' and 'parse-time-string'
+
+        * doc/lispref/os.texi (Time Parsing): Document
+        'parse-time-string', and refer to it for the description of
+        the argument of 'date-to-time'.
+
+        * lisp/calendar/time-date.el (date-to-time): Refer in the doc
+        string to 'parse-time-string' for more information about the
+        format of the DATE argument.  (Bug#34303)
+
+2019-02-08  Nick Drozd  <nicholasdrozd@gmail.com>
+
+        Fix downloading of URLs that end in a slash
+
+        * lisp/net/eww.el (eww-download-callback): Fix download URL
+        file name.  Previously this wasn't handling download URLs
+        correctly, resulting in all downloaded pages being named
+        "!", "!(1)", etc.  (Bug#34291)
+
+2019-02-08  Nick Drozd  <nicholasdrozd@gmail.com>
+
+        * doc/misc/eww.texi (Basics): Fix eww keybindings.  (Bug#34291)
+
+2019-02-08  Robert Pluim  <rpluim@gmail.com>
+
+        Fix process-thread docstring
+
+        * src/process.c (Fprocess_thread): Correct docstring.
+
+2019-02-08  Eli Zaretskii  <eliz@gnu.org>
+
+        Fix failures of vc-find-revision with non-ASCII file names
+
+        * lisp/vc/vc.el (vc-find-revision): Instead of binding
+        coding-system-for-write, make the buffer-file-coding-system of
+        the temporary buffer be no-conversion.  This avoids the
+        unwanted side effect of not encoding the command-line
+        arguments of the VCS commands invoked by the backend.
+        (Bug#34350)
+
+2019-02-07  Eli Zaretskii  <eliz@gnu.org>
+
+        * doc/lispref/tips.texi (Documentation Tips): Fix quotes.  (Bug#34372)
+
+2019-02-05  Alex Branham  <alex.branham@gmail.com>
+
+        Add documentation for tabulated-list functions in the elisp manual
+
+        * doc/lispref/modes.texi: Add documentation for
+          'tabulated-list-delete-entry', 'tabulated-list-get-id',
+          'tabulated-list-get-entry', 'tabulated-list-header-overlay-p',
+          'tabulated-list-put-tag', and 'tabulated-list-set-col'.
+
+        Bug#21074
+
+2019-02-03  Jean-Christophe Helary  <brandelune@gmail.com>
+
+        Fix URL in ucs-normalize.el
+
+        * lisp/international/ucs-normalize.el: Fix URL of the HFS
+        normalization reference.  (Bug#34300)
+
+2019-02-03  Alan Mackenzie  <acm@muc.de>
+
+        * etc/PROBLEMS: Amend entry for profiler bug #34235 to mention kernel 4.14.97
+
+2019-02-02  Glenn Morris  <rgm@gnu.org>
+
+        * make-dist: Remove references to src/stamp-h.in.
+
+        This file was removed two years ago in 2f89350.
+        No need to merge to master.
+
+2019-02-02  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * etc/PROBLEMS: Mention profiler-report bug (Bug#34235).
+
+2019-02-01  Eli Zaretskii  <eliz@gnu.org>
+
+        Correct the docs of inserting kmacro counter
+
+        * doc/emacs/kmacro.texi (Keyboard Macro Counter): Correct the
+        description of the affect "C-u" has on inserting the macro
+        counter.  Define "previous counter value".
+
+        * lisp/kmacro.el (kmacro-insert-counter)
+        (kmacro-start-macro-or-insert-counter): Fix the doc strings
+        regarding the effect of "C-u".  (Bug#34263)
+
+2019-02-01  Nicholas Drozd  <nicholasdrozd@gmail.com>
+
+        * doc/misc/calc.texi (Algebraic Tutorial): Fix a typo.  (Bug#34273)
+
+2019-02-01  Eli Zaretskii  <eliz@gnu.org>
+
+        Avoid errors in 'rmail-get-new-mail'
+
+        * lisp/mail/rmail.el (rmail-insert-inbox-text): Don't assume
+        the Rmail protocol is always a string when calling
+        'rmail-remote-proto-p'.  (Bug#34252)
+
+2019-01-31  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Fix process-contact bug with TCP connections
+
+        This fixes a regression from Emacs 25.3 (Bug#34134).
+        * src/process.c (server_accept_connection):
+        Set host correctly, fixing a bug introduced in
+        2017-09-16T21:29:18Z!eggert@cs.ucla.edu
+        when working around a GCC bug.
+
+2019-01-29  Eli Zaretskii  <eliz@gnu.org>
+
+        Minor copyedits in last manual change
+
+        * doc/emacs/custom.texi (Authentication): Improve markup,
+        indexing, and wording.
+
+2019-01-29  Eli Zaretskii  <eliz@gnu.org>
+
+        Improve documentation of face numbers
+
+        * doc/lispref/display.texi (Face Functions): Mention where the
+        face number is used and that it depends on the 'face' property
+        of the face symbol.  Improve indexing.
+
+2019-01-27  Michael Albinus  <michael.albinus@gmx.de>
+
+        * doc/emacs/custom.texi (Authentication): Refer to the "Help for users" node.
+
+2019-01-26  Michael Albinus  <michael.albinus@gmx.de>
+
+        New node Authentication in the Emacs manual
+
+        * doc/emacs/custom.texi (Customization):
+        * doc/emacs/emacs.texi (Top): Add node Authentication.
+
+2019-01-25  Alan Mackenzie  <acm@muc.de>
+
+        Fix a loop in c-fl-decl-start.  This fixes bug #34186.
+
+        * lisp/progmodes/cc-mode.el (c-fl-decl-start) In the pair of operations
+        c-syntactic-skip-backward and c-forward-syntactic-ws, ensure the latter
+        doesn't come back to the position before the former, and break out of the
+        enclosing loop if it does.
+
+2019-01-25  Eli Zaretskii  <eliz@gnu.org>
+
+        Fix LaTeX output of month and day from cal-tex.el
+
+        * lisp/calendar/cal-tex.el (cal-tex-cursor-week-iso)
+        (cal-tex-week-hours): Escape a lone blank, to make it through
+        LaTeX.  (Bug#34148)
+
+2019-01-25  Daniel Kahn Gillmor  <dkg@fifthhorseman.net>  (tiny change)
+
+        Avoid elisp crash for OpenPGP User IDs with no e-mail address
+
+        * lisp/gnus/mml-sec.el (mml-secure-check-user-id): Verify that
+        there is an e-mail address in the current User ID before trying
+        to downcase it.  (Bug#34121)
+
+2019-01-25  Benjamin Riefenstahl  <b.riefenstahl@turtle-trading.net>
+
+        image-mode: Do not use default scaling (bug#33990)
+
+        * lisp/image-mode.el (image-toggle-display-image): Set :scale == 1 so
+        that create-image does not apply additional scaling.
+
+2019-01-25  Benjamin Riefenstahl  <b.riefenstahl@turtle-trading.net>
+
+        create-image: Expand documentation (bug#33990)
+
+        * lisp/image.el (create-image): Discuss default for :scale in the doc
+        string.
+
+2019-01-21  Eli Zaretskii  <eliz@gnu.org>
+
+        Improve documentation of 'isearch-filter-predicate'
+
+        * lisp/isearch.el (isearch-filter-predicate)
+        (isearch-filter-visible): Doc fixes.  (Bug#34150)
+
+2019-01-19  Trevor Spiteri  <tspiteri@ieee.org>  (tiny change)
+
+        Fix cursor column positioning on Grep hits
+
+        * lisp/progmodes/grep.el (grep-match-face): Move before first
+        use, to avoid byte-compilation warning.
+        (grep-regexp-alist): Don't quote grep-match-face.  (Bug#34068)
+
+2019-01-18  Eli Zaretskii  <eliz@gnu.org>
+
+        Fix a typo in ELisp manual
+
+        * doc/lispref/nonascii.texi (Converting Representations): Fix
+        inconsistency between @defun and the argument description of
+        'byte-to-string'.  (Bug#34119)
+
+2019-01-15  Alan Third  <alan@idiocy.org>
+
+        Prevent redrawing if frame is garbaged
+
+        * src/nsterm.m ([EmacsView viewWillDraw]): Cancel drawing if the frame
+        has been garbaged.
+        * src/xdisp.c (expose_window_tree, expose_frame): Remove NS only
+        exceptions.
+
+2019-01-14  Eli Zaretskii  <eliz@gnu.org>
+
+        Attempt to fix hangs on MS-Windows due to C-g
+
+        * src/w32uniscribe.c (uniscribe_otf_capability): Set
+        inhibit-quit around calls to otf_features, because the latter
+        cons Lisp data structures while we are in a critical section.
+        * src/xdisp.c (ALLOCATE_HDC) [HAVE_NTGUI]: Set inhibit-quit.
+        (RELEASE_HDC) [HAVE_NTGUI]: Restore inhibit-quit.
+        (OPTIONAL_HDC, DECLARE_HDC): Remove macros, their job is now
+        done by ALLOCATE_HDC and by a single #ifdef.
+        (draw_glyphs): Adapt to the above changes in macros.
+        (Bug#34059)
+
+2019-01-13  Eli Zaretskii  <eliz@gnu.org>
+
+        Fix Calc graph output on MS-Windows
+
+        The previous code relied on "pgnuplot" executable, which is
+        no longer provided with Gnuplot 5.x.
+        * lisp/calc/calc.el (calc-gnuplot-name): Set to "pgnuplot" on
+        MS-Windows only if such an executable exists.
+        * lisp/calc/calc-graph.el (calc-graph-w32-p): New defsubst.
+        (calc-graph-plot, calc-graph-command, calc-gnuplot-command)
+        (calc-graph-init): Call calc-graph-w32-p wherever we need to
+        do something special for invoking gnuplot on MS-Windows,
+        instead of comparing against calc-gnuplot-name.
+        (calc-graph-plot): Set the terminal to "qt" on MS-Windows when
+        pgnuplot.exe is not available.
+        (calc-graph-kill): Delete the temporary files only after
+        killing the gnuplot process, otherwise the deletion might fail
+        on MS-Windows because the files are still in use.
+
+2019-01-13  Eli Zaretskii  <eliz@gnu.org>
+
+        Fix a minor mistake in ELisp manual
+
+        * doc/lispref/buffers.texi (Modification Time): Fix
+        documentation of 'visited-file-modtime'.  (Bug#34055)
+
+2019-01-12  Stephen Berman  <stephen.berman@gmx.net>
+
+        * etc/tutorials/TUTORIAL: Fix typo (bug#34049)
+
+2019-01-12  Devon Sean McCullough  <Emacs-Hacker2018@jovi.net>
+
+        Fix UI of Buffer-menu
+
+        * lisp/buff-menu.el (Buffer-menu-execute): Don't remove
+        entries of buffers whose killing the user didn't confirm.
+        (Bug#33669)
+
+2019-01-12  Philip K  <philip@warpmail.net>  (tiny change)
+
+        Reinitialize ispell-really-enchant when changing the speller
+
+        * lisp/textmodes/ispell.el (ispell-check-version): Reset also
+        ispell-really-enchant.  (Bug#34019)
+
+2019-01-07  Leo Liu  <sdl.web@gmail.com>
+
+        Speed up loading css-mode
+
+        lisp/textmodes/css-mode.el: Remove (require 'eww) which is redundant
+        and slow.  (Bug#33939)
+
+2019-01-07  Michael Albinus  <michael.albinus@gmx.de>
+
+        Adapt filenotify-tests for emba
+
+        * .gitlab-ci.yml (test): Add EMACS_EMBA_CI variable.
+
+        * test/lisp/filenotify-tests.el (file-notify-test03-events)
+        (file-notify-test05-file-validity)
+        (file-notify-test06-dir-validity)
+        (file-notify-test07-many-events)
+        (file-notify-test09-watched-file-in-watched-dir): Adapt tests for emba.
+
+2019-01-07  Nicolas Petton  <nicolas@petton.fr>
+
+        Bump Emacs version to 26.1.91
+
+        * README:
+        * configure.ac:
+        * msdos/sed2v2.inp:
+        * nt/README.W32: Bump Emacs version to 26.1.91.
+
+2019-01-07  Nicolas Petton  <nicolas@petton.fr>
+
+        * etc/AUTHORS: Update.
+
 2019-01-07  Leo Liu  <sdl.web@gmail.com>
 
         * lisp/textmodes/mhtml-mode.el: Avoid loading flyspell.  (Bug#33939)
@@ -64181,7 +64676,7 @@
 
 This file records repository revisions from
 commit 9d56a21e6a696ad19ac65c4b405aeca44785884a (exclusive) to
-commit 2cf20b67cf6836dd7bd80077042068afa0d7b04f (inclusive).
+commit a19bfb7a5e3557a69824cdbe7d414f5ef422555c (inclusive).
 See ChangeLog.1 for earlier changes.
 
 ;; Local Variables:
diff --git a/doc/emacs/ack.texi b/doc/emacs/ack.texi
index 3ad67397354..0e4a982da40 100644
--- a/doc/emacs/ack.texi
+++ b/doc/emacs/ack.texi
@@ -829,8 +829,8 @@ command with its arguments.
 Richard Mlynarik wrote @file{cl-indent.el}, a package for indenting
 Common Lisp code; @file{ebuff-menu.el}, an electric browser for
 buffer listings; @file{ehelp.el}, bindings for browsing help screens;
-and @file{rfc822.el}, a parser for E-mail addresses in the RFC-822 format,
-used in mail messages and news articles.
+and @file{rfc822.el}, a parser for E-mail addresses in the format
+used in mail messages and news articles (Internet RFC 822 and its successors).
 
 @item
 Gerd Möllmann was the Emacs maintainer from the beginning of Emacs 21
diff --git a/doc/lispref/abbrevs.texi b/doc/lispref/abbrevs.texi
index b92d3701ec9..b67c014a83d 100644
--- a/doc/lispref/abbrevs.texi
+++ b/doc/lispref/abbrevs.texi
@@ -473,7 +473,7 @@ Set the property @var{prop} of abbrev table @var{table} to value @var{val}.
 
 @defun abbrev-table-get table prop
 Return the property @var{prop} of abbrev table @var{table}, or @code{nil}
-if the abbrev has no such property.
+if @var{table} has no such property.
 @end defun
 
 The following properties have special meaning:
diff --git a/doc/lispref/os.texi b/doc/lispref/os.texi
index 9766b8321fa..cb8f25df0a3 100644
--- a/doc/lispref/os.texi
+++ b/doc/lispref/os.texi
@@ -1562,7 +1562,7 @@ following form:
 The format of this list is the same as what @code{decode-time} accepts
 (@pxref{Time Conversion}), and is described in more detail there.  Any
 element that cannot be determined from the input will be set to
-@code{nil}.  The argument @var{string} should resemble an RFC 2822 or
+@code{nil}.  The argument @var{string} should resemble an RFC 822 (or later) or
 ISO 8601 string, like ``Fri, 25 Mar 2016 16:24:56 +0100'' or
 ``1998-09-12T12:21:54-0200'', but this function will attempt to parse
 less well-formed time strings as well.
diff --git a/doc/lispref/syntax.texi b/doc/lispref/syntax.texi
index 25b9b35250f..b0c04ef9c25 100644
--- a/doc/lispref/syntax.texi
+++ b/doc/lispref/syntax.texi
@@ -1041,8 +1041,8 @@ This function returns the syntax code for the raw syntax descriptor
 @var{syntax-code} component, masks off the high 16 bits which record
 the syntax flags, and returns the resulting integer.
 
-If @var{syntax} is @code{nil}, the return value is returns @code{nil}.
-This is so that the expression
+If @var{syntax} is @code{nil}, the return value is @code{nil}.  This
+is so that the expression
 
 @example
 (syntax-class (syntax-after pos))
diff --git a/doc/misc/emacs-mime.texi b/doc/misc/emacs-mime.texi
index 123375ce7a4..09242407d02 100644
--- a/doc/misc/emacs-mime.texi
+++ b/doc/misc/emacs-mime.texi
@@ -698,13 +698,15 @@ Translation}.
 A description of the part (@code{Content-Description}).
 
 @item creation-date
-RFC822 date when the part was created (@code{Content-Disposition}).
+Date when the part was created (@code{Content-Disposition}).
+This uses the format of RFC 822 or its successors.
 
 @item modification-date
-RFC822 date when the part was modified (@code{Content-Disposition}).
+RFC 822 (or later) date when the part was modified
+(@code{Content-Disposition}).
 
 @item read-date
-RFC822 date when the part was read (@code{Content-Disposition}).
+RFC 822 (or later) date when the part was read (@code{Content-Disposition}).
 
 @item recipients
 Who to encrypt/sign the part to.  This field is used to override any
@@ -754,7 +756,7 @@ be obtained.  Values include @samp{ftp}, @samp{anon-ftp}, @samp{tftp},
 @samp{localfile}, and @samp{mailserver}.  (@code{Content-Type}.)
 
 @item expiration
-The RFC822 date after which the file may no longer be fetched.
+RFC 822 (or later) date after which the file may no longer be fetched.
 (@code{Content-Type}.)
 
 @item size
@@ -1301,7 +1303,7 @@ on.  High-level functionality is dealt with in the first chapter
 @menu
 * rfc2045::      Encoding @code{Content-Type} headers.
 * rfc2231::      Parsing @code{Content-Type} headers.
-* ietf-drums::   Handling mail headers defined by RFC822bis.
+* ietf-drums::   Handling mail headers defined by RFC 2822.
 * rfc2047::      En/decoding encoded words in headers.
 * time-date::    Functions for parsing dates and manipulating time.
 * qp::           Quoted-Printable en/decoding.
@@ -1385,8 +1387,8 @@ Encode a parameter in headers likes @code{Content-Type} and
 @node ietf-drums
 @section ietf-drums
 
-@dfn{drums} is an IETF working group that is working on the replacement
-for RFC822.
+@dfn{drums} was an IETF working group that worked on Internet RFC 2822,
+the first successor to RFC 822 and a predecessor of the current email standard.
 
 The functions provided by this library include:
 
@@ -1597,7 +1599,7 @@ The five data representations used are the following:
 
 @table @var
 @item date
-An RFC822 (or similar) date string.  For instance: @code{"Sat Sep 12
+An RFC 822 (or similar) date string.  For instance: @code{"Sat Sep 12
 12:21:54 1998 +0200"}.
 
 @item time
@@ -1889,55 +1891,55 @@ in @file{/etc/mailcap} will ``win'' over an @samp{image/*} setting in
 The Emacs @acronym{MIME} library implements handling of various elements
 according to a (somewhat) large number of RFCs, drafts and standards
 documents.  This chapter lists the relevant ones.  They can all be
-fetched from @uref{http://quimby.gnus.org/notes/}.
+fetched from @uref{https://www.rfc-editor.org}.
 
 @table @dfn
-@item RFC822
-@itemx STD11
-Standard for the Format of ARPA Internet Text Messages.
+@item RFC 5322
+Internet Message Format
 
-@item RFC1036
-Standard for Interchange of USENET Messages
+@item RFC 5536
+Netnews Article Format
 
-@item RFC2045
+@item RFC 2045
 Format of Internet Message Bodies
 
-@item RFC2046
+@item RFC 2046
 Media Types
 
-@item RFC2047
+@item RFC 2047
 Message Header Extensions for Non-@acronym{ASCII} Text
 
-@item RFC2048
-Registration Procedures
+@item RFC 6838
+Media Type Specifications and Registration Procedures
+
+@item RFC 4289
+Registration Procedures (obsoleting RFC 2048)
 
-@item RFC2049
+@item RFC 2049
 Conformance Criteria and Examples
 
-@item RFC2231
+@item RFC 2231
 @acronym{MIME} Parameter Value and Encoded Word Extensions: Character Sets,
 Languages, and Continuations
 
-@item RFC1843
+@item RFC 1843
 HZ---A Data Format for Exchanging Files of Arbitrarily Mixed Chinese and
 @acronym{ASCII} characters
 
-@item draft-ietf-drums-msg-fmt-05.txt
-Draft for the successor of RFC822
-
-@item RFC2112
+@item RFC 2387
 The @acronym{MIME} Multipart/Related Content-type
 
-@item RFC1892
-The Multipart/Report Content Type for the Reporting of Mail System
+@item RFC 6522
+@itemx STD 73
+The Multipart/Report Media Type for the Reporting of Mail System
 Administrative Messages
 
-@item RFC2183
+@item RFC 2183
 Communicating Presentation Information in Internet Messages: The
 Content-Disposition Header Field
 
-@item RFC2646
-Documentation of the text/plain format parameter for flowed text.
+@item RFC 3676
+The Text/Plain Format and DelSp Parameters
 
 @end table
 
diff --git a/doc/misc/eshell.texi b/doc/misc/eshell.texi
index 3540707318b..ce3a30c3a9e 100644
--- a/doc/misc/eshell.texi
+++ b/doc/misc/eshell.texi
@@ -213,8 +213,8 @@ available in the Emacs Lisp library.  It does this by transforming the
 input line into a callable Lisp form.@footnote{To see the Lisp form that will be invoked, type: @samp{eshell-parse-command "echo hello"}}
 
 The command can be either an Elisp function or an external command.
-Eshell looks first for an @ref{Aliases, alias} with the same name as the
-command, then a @ref{Built-ins, built-in command} or a function with the
+Eshell looks first for an alias (@pxref{Aliases}) with the same name as the
+command, then a built-in (@pxref{Built-ins}) or a function with the
 same name; if there is no match, it then tries to execute it as an
 external command.
 
@@ -253,7 +253,7 @@ eshell/ls is a compiled Lisp function in `em-ls.el'
 @end example
 
 If you want to discard a given built-in command, you could declare an
-alias, @ref{Aliases}.  Example:
+alias (@pxref{Aliases}).  Example:
 
 @example
 ~ $ which sudo
@@ -418,7 +418,7 @@ Lisp functions, based on successful completion).
 
 @end table
 
-@ref{Aliases} for the built-in variables @samp{$*}, @samp{$1},
+@xref{Aliases}, for the built-in variables @samp{$*}, @samp{$1},
 @samp{$2}, @dots{}, in alias definitions.
 
 @node Variables
@@ -629,8 +629,8 @@ to @code{"hello"}.
 Eshell's globbing syntax is very similar to that of Zsh.  Users coming
 from Bash can still use Bash-style globbing, as there are no
 incompatibilities.  Most globbing is pattern-based expansion, but there
-is also predicate-based expansion.  See
-@ref{Filename Generation, , , zsh, The Z Shell Manual}
+is also predicate-based expansion.  @xref{Filename Generation, , ,
+zsh, The Z Shell Manual},
 for full syntax.  To customize the syntax and behavior of globbing in
 Eshell see the Customize@footnote{@xref{Easy Customization, , , emacs,
 The GNU Emacs Manual}.}
diff --git a/doc/misc/gnus-coding.texi b/doc/misc/gnus-coding.texi
index 87af5e902e5..95544628f79 100644
--- a/doc/misc/gnus-coding.texi
+++ b/doc/misc/gnus-coding.texi
@@ -141,7 +141,7 @@ There are no Gnus dependencies in this file.
 There are no Gnus dependencies in this file.
 
 @item ietf-drums.el
-Functions for parsing RFC822bis headers.
+Functions for parsing RFC 2822 headers.
 @c As of 2005-10-21...
 There are no Gnus dependencies in this file.
 
diff --git a/doc/misc/gnus.texi b/doc/misc/gnus.texi
index 2862264312c..ff2dd7dd544 100644
--- a/doc/misc/gnus.texi
+++ b/doc/misc/gnus.texi
@@ -9679,7 +9679,7 @@ Each article is divided into two parts---the head and the body.  The
 body can be divided into a signature part and a text part.  The variable
 that says what is to be considered a signature is
 @code{gnus-signature-separator}.  This is normally the standard
-@samp{^-- $} as mandated by son-of-RFC 1036.  However, many people use
+@samp{^-- $} as mandated by RFC 5536.  However, many people use
 non-standard signature separators, so this variable can also be a list
 of regular expressions to be tested, one by one.  (Searches are done
 from the end of the body towards the beginning.)  One likely value is:
@@ -15991,8 +15991,9 @@ Mailers and list servers are notorious for doing all sorts of really,
 really stupid things with mail.  ``Hey, RFC 822 doesn't explicitly
 prohibit us from adding the string @code{wE aRe ElItE!!!!!1!!} to the
 end of all lines passing through our server, so let's do that!!!!1!''
-Yes, but RFC 822 wasn't designed to be read by morons.  Things that were
-considered to be self-evident were not discussed.  So.  Here we are.
+Yes, but RFC 822 and its successors weren't designed to be read by
+morons.  Things that were considered to be self-evident were not
+discussed.  So.  Here we are.
 
 Case in point:  The German version of Microsoft Exchange adds @samp{AW:
 } to the subjects of replies instead of @samp{Re: }.  I could pretend to
@@ -17374,7 +17375,7 @@ Announcement messages from LANL Gov Announce.
 
 @cindex forwarded messages
 @item rfc822-forward
-A message forwarded according to RFC822.
+A message forwarded according to RFC 822 or its successors.
 
 @item outlook
 The Outlook mail box.
@@ -26721,18 +26722,20 @@ with, of course.
 
 @table @strong
 
-@item RFC (2)822
+@item RFC 822
 @cindex RFC 822
 @cindex RFC 2822
-There are no known breaches of this standard.
+@cindex RFC 5322
+There are no known breaches of this standard or its successors
+(currently RFCs 2822 and 5322).
 
 @item RFC 1036
 @cindex RFC 1036
-There are no known breaches of this standard, either.
+There are no known breaches of this (now-obsolete) standard, either.
 
-@item Son-of-RFC 1036
-@cindex Son-of-RFC 1036
-We do have some breaches to this one.
+@item RFC 5536
+@cindex RFC 5536
+We do have some breaches of this standard, the successor of RFC 1036.
 
 @table @emph
 
@@ -26747,10 +26750,9 @@ it wasn't for the @code{X-Newsreader} header.
 
 @item USEFOR
 @cindex USEFOR
-USEFOR is an IETF working group writing a successor to RFC 1036, based
-on Son-of-RFC 1036.  They have produced a number of drafts proposing
-various changes to the format of news articles.  The Gnus towers will
-look into implementing the changes when the draft is accepted as an RFC.
+USEFOR was an IETF working group that produced Internet RFCs 5536 and 5537.
+The Gnus towers will look into implementing the changes embodied by these
+standards.
 
 @item MIME---RFC 2045--2049 etc
 @cindex @acronym{MIME}
@@ -29529,7 +29531,8 @@ header         = <text> eol
 @end example
 
 @cindex BNF
-(The version of BNF used here is the one used in RFC822.)
+(The version of extended BNF used here is ABNF, the one used in Internet RFCs.
+See RFC 5234.)
 
 If the return value is @code{nov}, the data buffer should contain
 @dfn{network overview database} lines.  These are basically fields
@@ -30327,7 +30330,7 @@ almost suspect that the author looked at the @acronym{NOV} specification and
 just shamelessly @emph{stole} the entire thing, and one would be right.
 
 @dfn{Header} is a severely overloaded term.  ``Header'' is used in
-RFC 1036 to talk about lines in the head of an article (e.g.,
+RFC 5536 to talk about lines in the head of an article (e.g.,
 @code{From}).  It is used by many people as a synonym for
 ``head''---``the header and the body''.  (That should be avoided, in my
 opinion.)  And Gnus uses a format internally that it calls ``header'',
diff --git a/doc/misc/sc.texi b/doc/misc/sc.texi
index 8b25dac32fb..7d53c6dbe5e 100644
--- a/doc/misc/sc.texi
+++ b/doc/misc/sc.texi
@@ -851,7 +851,8 @@ scanned.  Info key-value pairs are created for each header found.  Also,
 such useful information as the author's name and email address are
 extracted.  If the variable @code{sc-mail-warn-if-non-rfc822-p} is
 non-@code{nil}, then Supercite will warn you if it finds a mail header
-that does not conform to RFC822.  This is rare and indicates a problem
+that does not conform to RFC 822 (or later).
+This is rare and indicates a problem
 either with your MUA or the original author's MUA, or some MTA (mail
 transport agent) along the way.
 
diff --git a/etc/AUTHORS b/etc/AUTHORS
index 0f4ec253dc1..7b93876d3f6 100644
--- a/etc/AUTHORS
+++ b/etc/AUTHORS
@@ -108,8 +108,8 @@ Alan Shutko: changed diary-lib.el calendar.el bindings.el cal-hebrew.el
 
 Alan Third: wrote dabbrev-tests.el
 and changed nsterm.m nsfns.m nsterm.h nsmenu.m frame.el macfont.m
-  nsimage.m ns-win.el Info.plist.in conf_post.h frame.c frame.h
-  frames.texi keyboard.c macfont.h macos.texi picture.el rect.el xdisp.c
+  nsimage.m ns-win.el xdisp.c Info.plist.in conf_post.h frame.c frame.h
+  frames.texi keyboard.c macfont.h macos.texi picture.el rect.el
   battery.el callproc.c and 12 other files
 
 Alastair Burt: changed gnus-art.el smiley.el
@@ -163,7 +163,7 @@ Alexandru Harsanyi: wrote soap-client.el soap-inspect.el
 and changed emacs3.py vc-hooks.el vc.el xml.el
 
 Alex Branham: changed bibtex.el dired-x.el dired.el em-rebind.el eww.el
-  imenu.el programs.texi
+  imenu.el modes.texi programs.texi
 
 Alex Coventry: changed files.el
 
@@ -471,8 +471,9 @@ Benjamin Andresen: wrote ob-screen.el
 Benjamin Drieu: wrote pong.el
 and changed org-clock.el org.el
 
-Benjamin Riefenstahl: changed w32select.c emacs.c inc/ms-w32.h lisp.h
-  mac-win.el macterm.c mule-cmds.el runemacs.c tcl.el w32.c w32.h
+Benjamin Riefenstahl: changed w32select.c emacs.c image-mode.el image.el
+  inc/ms-w32.h lisp.h mac-win.el macterm.c mule-cmds.el runemacs.c tcl.el
+  w32.c w32.h
 
 Benjamin Rutt: co-wrote gnus-dired.el
 and changed vc.el gnus-msg.el message.el diff-mode.el ffap.el nnimap.el
@@ -699,7 +700,7 @@ and co-wrote longlines.el tango-dark-theme.el tango-theme.el
 and changed simple.el display.texi xdisp.c files.el frames.texi
   cus-edit.el files.texi custom.el subr.el text.texi faces.el keyboard.c
   startup.el package.el misc.texi emacs.texi modes.texi mouse.el
-  custom.texi image.c window.el and 936 other files
+  custom.texi image.c window.el and 935 other files
 
 Chris Chase: co-wrote idlw-shell.el idlwave.el
 
@@ -932,12 +933,16 @@ and changed package-test.el package-x.el ange-ftp.el
 
 Daniel Jensen: changed apropos.el
 
+Daniel Kahn Gillmor: changed mml-sec.el
+
 Daniel Koning: changed artist.el commands.texi subr.el
 
 Daniel LaLiberte: wrote cust-print.el edebug.el isearch.el
 and co-wrote hideif.el
 and changed mlconvert.el eval-region.el
 
+Daniel Lopez: changed progmodes/compile.el
+
 Daniel Lublin: changed dns-mode.el
 
 Daniel McClanahan: changed lisp-mode.el
@@ -1133,7 +1138,7 @@ and changed imenu.el pgg-def.el xterm.c
 David O'Toole: wrote ox-publish.el
 and co-wrote ob-lisp.el
 
-David Pathakjee: changed minibuf.c
+David Pathakjee: changed emacs-lisp/debug.el minibuf.c
 
 David Ponce: wrote bovine/grammar.el cedet.el comp.el java-tags.el
   mode-local.el recentf.el ruler-mode.el semantic/grammar.el
@@ -1209,7 +1214,8 @@ Derek Upham: changed nxml-mode.el
 Detlev Zundel: wrote re-builder.el
 and changed buffer.c
 
-Devon Sean McCullough: changed url-http.el comint.el ns-win.el
+Devon Sean McCullough: changed url-http.el buff-menu.el comint.el
+  ns-win.el
 
 Dhruva Krishnamurthy: changed emacsclient.c fontset.c sound.c w32proc.c
 
@@ -1434,7 +1440,7 @@ and changed c.srt ede.texi info.el rmail.el speedbspec.el cedet.el
   ede-autoconf.srt ede-make.srt eieio.texi gud.el sb-dir-minus.xpm
   sb-dir-plus.xpm sb-dir.xpm sb-mail.xpm sb-pg-minus.xpm sb-pg-plus.xpm
   sb-pg.xpm sb-tag-gt.xpm sb-tag-minus.xpm sb-tag-plus.xpm
-  sb-tag-type.xpm and 34 other files
+  sb-tag-type.xpm and 33 other files
 
 Eric Schulte: wrote ob-asymptote.el ob-awk.el ob-calc.el ob-comint.el
   ob-coq.el ob-css.el ob-ditaa.el ob-dot.el ob-emacs-lisp.el ob-eval.el
@@ -1735,7 +1741,7 @@ and changed configure.ac Makefile.in src/Makefile.in calendar.el
   diary-lib.el lisp/Makefile.in files.el rmail.el make-dist
   progmodes/f90.el bytecomp.el simple.el authors.el admin.el emacs.texi
   misc/Makefile.in startup.el lib-src/Makefile.in ack.texi display.texi
-  cal-menu.el and 1682 other files
+  cal-menu.el and 1681 other files
 
 Glynn Clements: wrote gamegrid.el snake.el tetris.el
 
@@ -1781,7 +1787,7 @@ Grégory Mounié: changed man.el
 
 Gregory Neil Shapiro: changed mailabbrev.el
 
-Gregor Zattler: changed emacs-lisp-intro.texi
+Gregor Zattler: changed eshell.texi emacs-lisp-intro.texi
 
 Greg Stark: changed gnus-ems.el timezone.el
 
@@ -2140,6 +2146,7 @@ and changed idlw-rinfo.el idlw-toolbar.el comint.el idlwave.texi vc.el
   mouse.el
 
 Jean-Christophe Helary: changed ns-win.el strings.texi subr-x.el
+  ucs-normalize.el
 
 Jean Haidouk: changed latin-alt.el latin-post.el latin-pre.el
 
@@ -2546,7 +2553,7 @@ Juri Linkov: wrote files-x.el misearch.el replace-tests.el
 and changed isearch.el info.el replace.el simple.el progmodes/grep.el
   dired.el dired-aux.el progmodes/compile.el startup.el faces.el files.el
   menu-bar.el bindings.el display.texi descr-text.el desktop.el comint.el
-  image-mode.el ispell.el man.el cus-edit.el and 360 other files
+  image-mode.el ispell.el man.el cus-edit.el and 359 other files
 
 Jussi Lahdenniemi: changed w32fns.c ms-w32.h msdos.texi w32.c w32.h
   w32console.c w32heap.c w32inevt.c w32term.h
@@ -2568,7 +2575,7 @@ and co-wrote longlines.el tramp-sh.el tramp.el
 and changed message.el gnus-agent.el gnus-sum.el files.el nnmail.el
   tramp.texi nntp.el gnus.el simple.el ange-ftp.el dired.el paragraphs.el
   bindings.el files.texi gnus-art.el gnus-group.el man.el INSTALL
-  Makefile.in crisp.el fileio.c and 45 other files
+  Makefile.in crisp.el fileio.c and 44 other files
 
 Kailash C. Chowksey: changed HELLO ind-util.el kannada.el knd-util.el
   lisp/Makefile.in loadup.el
@@ -2637,8 +2644,8 @@ Katsuhiro Hermit Endo: changed gnus-group.el gnus-spec.el
 
 Katsumi Yamaoka: wrote canlock.el
 and changed gnus-art.el message.el gnus-sum.el mm-decode.el gnus.texi
-  mm-util.el mm-view.el gnus-util.el gnus-group.el gnus-msg.el shr.el
-  mml.el rfc2047.el gnus-start.el gnus.el nntp.el gnus-agent.el nnrss.el
+  mm-util.el mm-view.el gnus-util.el gnus-group.el gnus-msg.el mml.el
+  shr.el rfc2047.el gnus-start.el gnus.el nntp.el gnus-agent.el nnrss.el
   mm-uu.el nnmail.el emacs-mime.texi and 160 other files
 
 Kaushal Modi: changed files.el isearch.el apropos.el calc-yank.el
@@ -2955,7 +2962,7 @@ Luc Teirlinck: wrote help-at-pt.el
 and changed files.el autorevert.el cus-edit.el subr.el simple.el
   frames.texi startup.el display.texi files.texi dired.el comint.el
   modes.texi custom.texi emacs.texi fns.c frame.el ielm.el minibuf.texi
-  variables.texi buffers.texi commands.texi and 213 other files
+  variables.texi buffers.texi commands.texi and 212 other files
 
 Ludovic Courtès: wrote nnregistry.el
 and changed configure.ac gnus.texi loadup.el
@@ -3160,7 +3167,7 @@ Martin Pohlack: changed iimage.el pc-select.el
 Martin Rudalics: changed window.el window.c windows.texi frame.c
   frames.texi w32fns.c xdisp.c xterm.c w32term.c frame.el xfns.c help.el
   buffer.c display.texi cus-start.el dispnew.c frame.h mouse.el nsfns.m
-  window.h gtkutil.c and 202 other files
+  window.h gtkutil.c and 203 other files
 
 Martin Stjernholm: wrote cc-bytecomp.el
 and co-wrote cc-align.el cc-cmds.el cc-compat.el cc-defs.el cc-engine.el
@@ -3283,7 +3290,7 @@ and changed tramp.texi tramp-adb.el trampver.el trampver.texi dbusbind.c
   file-notify-tests.el ange-ftp.el files.el dbus.texi files.texi
   autorevert.el tramp-fish.el kqueue.c tramp-gw.el tramp-imap.el os.texi
   configure.ac lisp.h gfilenotify.c inotify.c keyboard.c
-  and 222 other files
+  and 224 other files
 
 Michael Ben-Gershon: changed acorn.h configure.ac riscix1-1.h riscix1-2.h
   unexec.c
@@ -3349,7 +3356,7 @@ Michael Olson: changed erc.el erc-backend.el Makefile erc-track.el
   erc-log.el erc-stamp.el erc-autoaway.el erc-dcc.el erc-goodies.el
   erc-list.el erc-compat.el erc-identd.el erc.texi ERC-NEWS erc-bbdb.el
   erc-match.el erc-notify.el erc-ibuffer.el erc-services.el remember.el
-  erc-button.el and 56 other files
+  erc-button.el and 55 other files
 
 Michael Piotrowski: changed gnus-art.el gnus-sum.el ps-print.el
 
@@ -3547,6 +3554,8 @@ Niall Mansfield: changed etags.c
 
 Nic Ferrier: changed ert.el tramp.el
 
+Nicholas Drozd: changed calc.texi
+
 Nicholas Maniscalco: changed term.el
 
 Nick Alcock: changed control.texi customize.texi display.texi files.el
@@ -3556,6 +3565,8 @@ Nick Alcock: changed control.texi customize.texi display.texi files.el
 Nick Dokos: changed org-table.el ox.el icalendar.el mh-search.el
   org-mobile.el org.el ox-ascii.el url-cache.el
 
+Nick Drozd: changed eww.el eww.texi
+
 Nick Helm: changed eldoc.el help.el help.texi whitespace-tests.el
   whitespace.el
 
@@ -3742,7 +3753,7 @@ and co-wrote cal-dst.el
 and changed lisp.h configure.ac alloc.c process.c fileio.c editfns.c
   xdisp.c sysdep.c keyboard.c image.c emacs.c xterm.c data.c lread.c
   fns.c callproc.c Makefile.in gnulib.mk eval.c buffer.c frame.c
-  and 1600 other files
+  and 1608 other files
 
 Paul Fisher: changed fns.c
 
@@ -3901,6 +3912,8 @@ and changed package.el pcmpl-unix.el subr.el
 
 Philip Jackson: wrote find-cmd.el org-irc.el
 
+Philip K: changed ispell.el
+
 Philippe Schnoebelen: wrote gomoku.el mpuz.el
 
 Philippe Vaucher: changed callint.c composite.el debugging.texi
@@ -4146,9 +4159,9 @@ Roberto Rodríguez: changed ada-mode.texi glossary.texi widget.texi
 Robert P. Goldman: changed org.texi ob-exp.el org.el ox-latex.el
 
 Robert Pluim: changed gtkutil.c configure.ac files.texi dired-x.texi
-  ftfont.c misc.texi vc-git.el xfns.c xterm.c bindings.el desktop.el
-  efaq.texi epa.texi filelock.c font.c ftcrfont.c gnus-agent.el
-  gnus-demon.el gnus.texi gtkutil.h ido.el and 19 other files
+  ftfont.c misc.texi process.c vc-git.el xfns.c xterm.c bindings.el
+  desktop.el efaq.texi epa.texi filelock.c font.c ftcrfont.c
+  gnus-agent.el gnus-demon.el gnus.texi gtkutil.h and 19 other files
 
 Robert Thorpe: changed cus-start.el indent.el
 
@@ -4530,7 +4543,7 @@ and co-wrote todo-mode.el
 and changed todo-mode.texi diary-lib.el dired-tests.el doc-view.el
   files.el minibuffer.el wdired-tests.el dired.el frames.texi hl-line.el
   info.el menu-bar.el mouse.el otodo-mode.el subr.el .gitattributes
-  allout.el artist.el compile.texi cus-start.el descr-text.el
+  TUTORIAL allout.el artist.el compile.texi cus-start.el
   and 43 other files
 
 Stephen C. Gilardi: changed configure.ac
@@ -4697,7 +4710,7 @@ Teodor Zlatanov: wrote auth-source.el gnus-registry.el gnus-tests.el
 and changed spam.el gnus.el nnimap.el gnus.texi gnutls.c gnus-sum.el
   auth.texi cfengine.el gnus-sync.el gnus-util.el gnus-start.el netrc.el
   gnutls.h message.el spam-stat.el encrypt.el mail-source.el nnir.el
-  nnmail.el auth-source-tests.el configure.ac and 121 other files
+  nnmail.el auth-source-tests.el configure.ac and 120 other files
 
 Terje Rosten: changed xfns.c version.el xterm.c xterm.h
 
@@ -4915,6 +4928,8 @@ Trent W. Buck: changed rcirc.el remember.el rx.el
 
 Trevor Murphy: changed gnus.texi nnimap.el org.el
 
+Trevor Spiteri: changed progmodes/grep.el
+
 Trey Jackson: changed spam-stat.el
 
 Triet Hoai Lai: changed vntelex.el viet-util.el vietnamese.el
@@ -4998,6 +5013,8 @@ Vibhav Pant: changed bytecomp.el byte-opt.el bytecode.c bytecomp-tests.el
   emacs-module.c erc-backend.el erc.el eshell.texi fns.c hangul.el
   image.c lisp.h lread.c print.c profiler.c xterm.c
 
+Victor J. Orlikowski: changed erc-dcc.el
+
 Victor Zandy: wrote zone.el
 
 Viktor Rosenfeld: changed ob-sql.el org.el
diff --git a/lisp/calendar/parse-time.el b/lisp/calendar/parse-time.el
index fb05a6c55d4..93e7e53b6ab 100644
--- a/lisp/calendar/parse-time.el
+++ b/lisp/calendar/parse-time.el
@@ -147,7 +147,7 @@ letters, digits, plus or minus signs or colons."
 ;;;###autoload
 (defun parse-time-string (string)
   "Parse the time-string STRING into (SEC MIN HOUR DAY MON YEAR DOW DST TZ).
-STRING should be on something resembling an RFC2822 string, a la
+STRING should be something resembling an RFC 822 (or later) date-time, e.g.,
 \"Fri, 25 Mar 2016 16:24:56 +0100\", but this function is
 somewhat liberal in what format it accepts, and will attempt to
 return a \"likely\" value even for somewhat malformed strings.
diff --git a/lisp/emacs-lisp/debug.el b/lisp/emacs-lisp/debug.el
index b0ede3b6bbc..8989aa07196 100644
--- a/lisp/emacs-lisp/debug.el
+++ b/lisp/emacs-lisp/debug.el
@@ -744,7 +744,7 @@ This function is called when SYMBOL's value is modified."
 
 When called interactively, prompt for VARIABLE in the minibuffer.
 
-This works by calling `add-variable-watch' on VARIABLE.  If you
+This works by calling `add-variable-watcher' on VARIABLE.  If you
 quit from the debugger, this will abort the change (unless the
 change is caused by the termination of a let-binding).
 
diff --git a/lisp/gnus/gnus-cite.el b/lisp/gnus/gnus-cite.el
index d572f22f00d..2216d4a0420 100644
--- a/lisp/gnus/gnus-cite.el
+++ b/lisp/gnus/gnus-cite.el
@@ -92,7 +92,7 @@ The first regexp group should match the Supercite attribution."
 ;;     -----Original Message-----
 ;;     From: ...
 ;;     To: ...
-;;     Sent: ...   [date, in non-RFC-2822 format]
+;;     Sent: ...   [date, in non-RFC-822-or-later format]
 ;;     Subject: ...
 ;;
 ;;     Cited message, with no prefixes
diff --git a/lisp/gnus/gnus-util.el b/lisp/gnus/gnus-util.el
index ca1466d630b..d570f78347b 100644
--- a/lisp/gnus/gnus-util.el
+++ b/lisp/gnus/gnus-util.el
@@ -139,7 +139,7 @@ This is a compatibility function for different Emacsen."
 
 (defun gnus-extract-address-components (from)
   "Extract address components from a From header.
-Given an RFC-822 address FROM, extract full name and canonical address.
+Given an RFC-822 (or later) address FROM, extract name and address.
 Returns a list of the form (FULL-NAME CANONICAL-ADDRESS).  Much more simple
 solution than `mail-header-parse-address', which works much better, but
 is slower."
diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el
index b0674525a86..00853379400 100644
--- a/lisp/gnus/message.el
+++ b/lisp/gnus/message.el
@@ -1285,10 +1285,9 @@ called and its result is inserted."
              (goto-char (point-min))
              (let ((case-fold-search nil))
                (re-search-forward "^OR\\>" nil t))))
-      ;; According to RFC822, "The field-name must be composed of printable
-      ;; ASCII characters (i. e., characters that have decimal values between
-      ;; 33 and 126, except colon)", i. e., any chars except ctl chars,
-      ;; space, or colon.
+      ;; According to RFC 822 and its successors, the field name must
+      ;; consist of printable US-ASCII characters other than colon,
+      ;; i.e., decimal 33-56 and 59-126.
       '(looking-at "[ \t]\\|[][!\"#$%&'()*+,-./0-9;<=>?@A-Z\\\\^_`a-z{|}~]+:"))
   "Set this non-nil if the system's mailer runs the header and body together.
 \(This problem exists on Sunos 4 when sendmail is run in remote mode.)
@@ -1791,8 +1790,8 @@ You must have the \"hashcash\" binary installed, see `hashcash-path'."
     (concat
      "From "
 
-     ;; Many things can happen to an RFC 822 mailbox before it is put into
-     ;; a `From' line.  The leading phrase can be stripped, e.g.
+     ;; Many things can happen to an RFC 822 (or later) mailbox before it is
+     ;; put into a `From' line.  The leading phrase can be stripped, e.g.
      ;; `Joe <@w.x:joe@y.z>' -> `<@w.x:joe@y.z>'.  The <> can be stripped, e.g.
      ;; `<@x.y:joe@y.z>' -> `@x.y:joe@y.z'.  Everything starting with a CRLF
      ;; can be removed, e.g.
@@ -5732,7 +5731,7 @@ In posting styles use `(\"Expires\" (make-expires-date 30))'."
         (insert fullname)
         (goto-char (point-min))
         ;; Look for a character that cannot appear unquoted
-        ;; according to RFC 822.
+        ;; according to RFC 822 (or later).
         (when (re-search-forward "[^- !#-'*+/-9=?A-Z^-~]" nil 1)
           ;; Quote fullname, escaping specials.
           (goto-char (point-min))
@@ -5746,8 +5745,7 @@ In posting styles use `(\"Expires\" (make-expires-date 30))'."
         (let ((fullname-start (point)))
           (insert fullname)
           (goto-char fullname-start)
-          ;; RFC 822 says \ and nonmatching parentheses
-          ;; must be escaped in comments.
+          ;; \ and nonmatching parentheses must be escaped in comments.
           ;; Escape every instance of ()\ ...
           (while (re-search-forward "[()\\]" nil 1)
             (replace-match "\\\\\\&" t))
diff --git a/lisp/gnus/mm-bodies.el b/lisp/gnus/mm-bodies.el
index 73305a159d9..e1e1a12cc59 100644
--- a/lisp/gnus/mm-bodies.el
+++ b/lisp/gnus/mm-bodies.el
@@ -35,7 +35,7 @@
 ;; BS, vertical TAB, form feed, and ^_
 ;;
 ;; Note that CR is *not* included, as that would allow a non-paired CR
-;; in the body contrary to RFC 2822:
+;; in the body contrary to RFC 822 (or later):
 ;;
 ;;   - CR and LF MUST only occur together as CRLF; they MUST NOT
 ;;     appear independently in the body.
diff --git a/lisp/gnus/nnrss.el b/lisp/gnus/nnrss.el
index 6a475966641..7f2accc2b66 100644
--- a/lisp/gnus/nnrss.el
+++ b/lisp/gnus/nnrss.el
@@ -446,16 +446,16 @@ nnrss: %s: Not valid XML %s and libxml-parse-html-region doesn't work %s"
 (autoload 'timezone-parse-date "timezone")
 
 (defun nnrss-normalize-date (date)
-  "Return a date string of DATE in the RFC822 style.
+  "Return a date string of DATE in the style of RFC 822 and its successors.
 This function handles the ISO 8601 date format described in
-URL `http://www.w3.org/TR/NOTE-datetime', and also the RFC822 style
+URL `http://www.w3.org/TR/NOTE-datetime', and also the RFC 822 style
 which RSS 2.0 allows."
   (let (case-fold-search vector year month day time zone cts given)
     (cond ((null date))                 ; do nothing for this case
           ;; if the date is just digits (unix time stamp):
           ((string-match "^[0-9]+$" date)
            (setq given (encode-time (string-to-number date))))
-          ;; RFC822
+          ;; RFC 822
           ((string-match " [0-9]+ " date)
            (setq vector (timezone-parse-date date)
                  year (string-to-number (aref vector 0)))
diff --git a/lisp/image.el b/lisp/image.el
index 3aa3b0aa240..c66440c86e7 100644
--- a/lisp/image.el
+++ b/lisp/image.el
@@ -925,7 +925,7 @@ has no effect."
   :version "24.3")
 
 (defcustom imagemagick-enabled-types
-  '(3FR ART ARW AVS BMP BMP2 BMP3 CAL CALS CMYK CMYKA CR2 CRW
+  '(3FR ARW AVS BMP BMP2 BMP3 CAL CALS CMYK CMYKA CR2 CRW
     CUR CUT DCM DCR DCX DDS DJVU DNG DPX EXR FAX FITS GBR GIF
     GIF87 GRB HRZ ICB ICO ICON J2C JNG JP2 JPC JPEG JPG JPX K25
     KDC MIFF MNG MRW MSL MSVG MTV NEF ORF OTB PBM PCD PCDS PCL
@@ -959,7 +959,7 @@ has no effect."
   :set (lambda (symbol value)
          (set-default symbol value)
          (imagemagick-register-types))
-  :version "24.3")
+  :version "26.2")                      ; remove ART (bug#22289)
 
 (imagemagick-register-types)
 
diff --git a/lisp/ldefs-boot.el b/lisp/ldefs-boot.el
index a6c7669c70c..dfaaa71b712 100644
--- a/lisp/ldefs-boot.el
+++ b/lisp/ldefs-boot.el
@@ -6854,7 +6854,7 @@ Trigger a debugger invocation when VARIABLE is changed.
 
 When called interactively, prompt for VARIABLE in the minibuffer.
 
-This works by calling `add-variable-watch' on VARIABLE.  If you
+This works by calling `add-variable-watcher' on VARIABLE.  If you
 quit from the debugger, this will abort the change (unless the
 change is caused by the termination of a let-binding).
 
@@ -19472,9 +19472,10 @@ the current value of `kmacro-counter').
 
 When used during defining/executing a macro, inserts the current value
 of `kmacro-counter' and increments the counter value by ARG (or by 1 if no
-prefix argument).  With just \\[universal-argument], inserts the current value
-of `kmacro-counter', but does not modify the counter; this is the
-same as incrementing the counter by zero.
+prefix argument).  With just \\[universal-argument], inserts the previous
+value of `kmacro-counter', and does not modify the counter; this is
+different from incrementing the counter by zero.  (The previous value
+of the counter is the one it had before the last increment.)
 
 The macro counter can be set directly via \\[kmacro-set-counter] and \\[kmacro-add-counter].
 The format of the inserted value of the counter can be controlled
@@ -20157,7 +20158,8 @@ and then select the region of un-tablified names and use
 ;;; Generated autoloads from mail/mail-extr.el
 
 (autoload 'mail-extract-address-components "mail-extr" "\
-Given an RFC-822 address ADDRESS, extract full name and canonical address.
+Extract full name and canonical address from ADDRESS.
+ADDRESS should be in RFC 822 (or later) format.
 Returns a list of the form (FULL-NAME CANONICAL-ADDRESS).  If no
 name can be extracted, FULL-NAME will be nil.  Also see
 `mail-extr-ignore-single-names' and
@@ -20248,7 +20250,7 @@ This function normally would be called when the message is sent.
 ;;; Generated autoloads from mail/mail-utils.el
 
 (defvar mail-use-rfc822 nil "\
-If non-nil, use a full, hairy RFC822 parser on mail addresses.
+If non-nil, use a full, hairy RFC 822 (or later) parser on mail addresses.
 Otherwise, (the default) use a smaller, somewhat faster, and
 often correct parser.")
 
@@ -24925,7 +24927,7 @@ matching parenthesis is highlighted in `show-paren-style' after
 
 (autoload 'parse-time-string "parse-time" "\
 Parse the time-string STRING into (SEC MIN HOUR DAY MON YEAR DOW DST TZ).
-STRING should be on something resembling an RFC2822 string, a la
+STRING should be something resembling an RFC 822 (or later) date-time, e.g.,
 \"Fri, 25 Mar 2016 16:24:56 +0100\", but this function is
 somewhat liberal in what format it accepts, and will attempt to
 return a \"likely\" value even for somewhat malformed strings.
@@ -30047,7 +30049,7 @@ Otherwise, let mailer send back a message to report errors.")
 (defvar send-mail-function (if (and (boundp 'smtpmail-smtp-server) smtpmail-smtp-server) 'smtpmail-send-it 'sendmail-query-once) "\
 Function to call to send the current buffer as mail.
 The headers should be delimited by a line which is
-not a valid RFC822 header or continuation line,
+not a valid RFC 822 (or later) header or continuation line,
 that matches the variable `mail-header-separator'.
 This is used by the default mail-sending commands.  See also
 `message-send-mail-function' for use with the Message package.")
@@ -34215,6 +34217,7 @@ Return a string giving the duration of the Emacs initialization.
 
 (autoload 'date-to-time "time-date" "\
 Parse a string DATE that represents a date-time and return a time value.
+DATE should be in one of the forms recognized by `parse-time-string'.
 If DATE lacks timezone information, GMT is assumed.
 
 \(fn DATE)" nil nil)
diff --git a/lisp/mail/feedmail.el b/lisp/mail/feedmail.el
index 2b63343239b..ff178241a90 100644
--- a/lisp/mail/feedmail.el
+++ b/lisp/mail/feedmail.el
@@ -561,7 +561,7 @@ but common in some proprietary systems."
 ;; maybe some distant mail system needs it.  Really, though, if you
 ;; want a sender line in your mail, just put one in there and don't
 ;; wait for feedmail to do it for you.  (Yes, I know all about
-;; RFC-822 and RFC-1123, but are you *really* one of those cases
+;; RFC-822-or-later and RFC-1123, but are you *really* one of those cases
 ;; they're talking about?  I doubt it.)
 (defcustom feedmail-sender-line nil
   "If non-nil and the email has no Sender: header, use this value.
@@ -787,7 +787,7 @@ cases the name element of the fiddle-plex is ignored and is hardwired
 by feedmail to either \"Date\" or \"Resent-Date\".
 
 If you decide to format your own date field, do us all a favor and know
-what you're doing.  Study the relevant parts of RFC-822 and RFC-1123.
+what you're doing.  Study the relevant parts of RFC-822-or-later and RFC-1123.
 Don't make me come up there!
 
 You should let feedmail generate a Date: for you unless you are sure
@@ -1514,7 +1514,7 @@ function, for example, to archive all of your sent messages someplace
 
 
 (defvar feedmail-is-a-resend nil
-  "Non-nil means the message is a Resend (in the RFC-822 sense).
+  "Non-nil means the message is a Resend (in the RFC-822-or-later sense).
 This affects the composition of certain headers.  feedmail sets this
 variable as soon as it starts prepping the message text buffer, so any
 user-supplied functions can rely on it.  Users shouldn't set or change this
@@ -2443,7 +2443,7 @@ mapped to mostly alphanumerics for safety."
 
           (let ((case-fold-search t) (addr-regexp))
             (goto-char (point-min))
-            ;; There are some RFC-822 combinations/cases missed here,
+            ;; There are some RFC-822-or-later combinations/cases missed here,
             ;; but probably good enough and what users expect.
             ;;
             ;; Use resent-* stuff only if there is at least one non-empty one.
diff --git a/lisp/mail/ietf-drums.el b/lisp/mail/ietf-drums.el
index 81377c9c41a..29752cb5c28 100644
--- a/lisp/mail/ietf-drums.el
+++ b/lisp/mail/ietf-drums.el
@@ -1,4 +1,4 @@
-;;; ietf-drums.el --- Functions for parsing RFC822bis headers  -*- lexical-binding:t -*-
+;;; ietf-drums.el --- Functions for parsing RFC 2822 headers  -*- lexical-binding:t -*-
 
 ;; Copyright (C) 1998-2019 Free Software Foundation, Inc.
 
@@ -20,10 +20,10 @@
 
 ;;; Commentary:
 
-;; DRUMS is an IETF Working Group that works (or worked) on the
-;; successor to RFC822, "Standard For The Format Of Arpa Internet Text
-;; Messages".  This library is based on
-;; draft-ietf-drums-msg-fmt-05.txt, released on 1998-08-05.
+;; DRUMS is an IETF Working Group that worked on Internet RFC 2822,
+;; the successor to RFC 822 and the predecessor of RFC 5322.  This
+;; library is based on draft-ietf-drums-msg-fmt-05.txt, released on
+;; 1998-08-05.
 
 ;; Pending a real regression self test suite, Simon Josefsson added
 ;; various self test expressions snipped from bug reports, and their
diff --git a/lisp/mail/mail-extr.el b/lisp/mail/mail-extr.el
index 1b650c9aed9..ae849d7b62b 100644
--- a/lisp/mail/mail-extr.el
+++ b/lisp/mail/mail-extr.el
@@ -1,4 +1,4 @@
-;;; mail-extr.el --- extract full name and address from RFC 822 mail header
+;;; mail-extr.el --- extract full name and address from email header
 
 ;; Copyright (C) 1991-1994, 1997, 2001-2019 Free Software Foundation,
 ;; Inc.
@@ -29,15 +29,15 @@
 ;;
 ;;    mail-extract-address-components: (address &optional all)
 ;;
-;;    Given an RFC-822 ADDRESS, extract full name and canonical address.
+;;    Given an RFC-822-or-later ADDRESS, extract name and address.
 ;;    Returns a list of the form (FULL-NAME CANONICAL-ADDRESS).
 ;;    If no name can be extracted, FULL-NAME will be nil.
 ;;    ADDRESS may be a string or a buffer.  If it is a buffer, the visible
 ;;     (narrowed) portion of the buffer will be interpreted as the address.
 ;;     (This feature exists so that the clever caller might be able to avoid
 ;;     consing a string.)
-;;    If ADDRESS contains more than one RFC-822 address, only the first is
-;;     returned.
+;;    If ADDRESS contains more than one RFC-822-or-later address, only
+;;     the first is returned.
 ;;
 ;;    If ALL is non-nil, that means return info about all the addresses
 ;;     that are found in ADDRESS.  The value is a list of elements of
@@ -149,7 +149,7 @@
 ;;      * Handle "null" addresses.  Handle = used for spacing in mailbox
 ;;        name.  Fix bug in handling of ROUTE-ADDR-type addresses that are
 ;;        missing their brackets.  Handle uppercase "JR".  Extract full
-;;        names from X.400 addresses encoded in RFC-822.  Fix bug in
+;;        names from X.400 addresses encoded in RFC-822-or-later.  Fix bug in
 ;;        handling of multiple addresses where first has trailing comment.
 ;;        Handle more kinds of telephone extension lead-ins.
 ;;
@@ -209,7 +209,7 @@
 
 
 (defgroup mail-extr nil
-  "Extract full name and address from RFC 822 mail header."
+  "Extract full name and address from RFC 822 (or later) mail header."
   :prefix "mail-extr-"
   :group 'mail)
 
@@ -288,8 +288,9 @@ by translating things like \"foo!bar!baz@host\" into \"baz@bar.UUCP\"."
 (defconst mail-extr-all-letters-but-separators
   (purecopy "][[:alnum:]{|}'~`"))
 
-;; Any character that can occur in a name in an RFC822 address including
-;; the separator (hyphen and possibly period) for multipart names.
+;; Any character that can occur in a name in an RFC 822 (or later)
+;; address including the separator (hyphen and possibly period) for
+;; multipart names.
 ;; #### should . be in here?
 (defconst mail-extr-all-letters
   (purecopy (concat mail-extr-all-letters-but-separators "---")))
@@ -532,7 +533,8 @@ by translating things like \"foo!bar!baz@host\" into \"baz@bar.UUCP\"."
     (?.  ".")
     (?\[ ".")
     (?\] ".")
-    ;; % and ! aren't RFC822 characters, but it is convenient to pretend
+    ;; % and ! aren't RFC 822 (or later) characters,
+    ;; but it is convenient to pretend.
     (?%  ".")
     (?!  ".") ;; this needs to be word-constituent when not in .UUCP mode
     )
@@ -697,7 +699,8 @@ Unless NO-REPLACE is true, at each of the positions in LIST-SYMBOL
 
 ;;;###autoload
 (defun mail-extract-address-components (address &optional all)
-  "Given an RFC-822 address ADDRESS, extract full name and canonical address.
+  "Extract full name and canonical address from ADDRESS.
+ADDRESS should be in RFC 822 (or later) format.
 Returns a list of the form (FULL-NAME CANONICAL-ADDRESS).  If no
 name can be extracted, FULL-NAME will be nil.  Also see
 `mail-extr-ignore-single-names' and
@@ -936,10 +939,10 @@ non-display use, you should probably use
           ;; Trim other punctuation lists of items outside < > pair to handle
           ;; stupid MTAs.
           (when <-pos                   ; don't need to check >-pos also
-            ;; handle bozo software that violates RFC 822 by sticking
-            ;; punctuation marks outside of a < > pair
+            ;; Handle bozo software that violates RFC 822 (or later)
+            ;; by sticking punctuation marks outside of a < > pair.
             (mail-extr-nuke-outside-range @-pos <-pos >-pos t)
-            ;; RFC 822 says nothing about these two outside < >, but
+            ;; RFC 822 (or later) says nothing about these two outside < >, but
             ;; remove those positions from the lists to make things
             ;; easier.
             (mail-extr-nuke-outside-range !-pos <-pos >-pos t)
@@ -1325,7 +1328,7 @@ non-display use, you should probably use
                        (narrow-to-region atom-beg atom-end)
                        (cond
 
-                        ;; Handle X.400 addresses encoded in RFC-822.
+                        ;; Handle X.400 addresses encoded in RFC 822 or later.
                         ;; *** Shit!  This has to handle the case where it is
                         ;; *** embedded in a quote too!
                         ;; *** Shit!  The input is being broken up into atoms
diff --git a/lisp/mail/mail-utils.el b/lisp/mail/mail-utils.el
index 61b972665eb..cbcbdfaeb2e 100644
--- a/lisp/mail/mail-utils.el
+++ b/lisp/mail/mail-utils.el
@@ -29,7 +29,7 @@
 
 ;;;###autoload
 (defcustom mail-use-rfc822 nil
-  "If non-nil, use a full, hairy RFC822 parser on mail addresses.
+  "If non-nil, use a full, hairy RFC 822 (or later) parser on mail addresses.
 Otherwise, (the default) use a smaller, somewhat faster, and
 often correct parser."
   :type 'boolean
@@ -384,7 +384,7 @@ The buffer should be narrowed to just the header."
          (date (mail-fetch-field "date"))
          ;; A From: header can contain multiple addresses, a "From "
          ;; line must contain only one.  (Bug#7760)
-         ;; See eg RFC 5322, 3.6.2. Originator Fields.
+         ;; See, e.g., RFC 5322, 3.6.2. Originator Fields.
          (end (string-match "[ \t]*[,\n]" from)))
     (format "From %s %s\n" (if end
                                (substring from 0 end)
diff --git a/lisp/mail/mailclient.el b/lisp/mail/mailclient.el
index 5dd66ff8452..4d8cda10fff 100644
--- a/lisp/mail/mailclient.el
+++ b/lisp/mail/mailclient.el
@@ -152,7 +152,7 @@ The mail client is taken to be the handler of mailto URLs."
                   (setq character-coding (downcase character-coding)))
                 (concat
                  "mailto:"
-                 ;; some of the headers according to RFC822
+                 ;; Some of the headers according to RFC 822 (or later).
                  (mailclient-gather-addresses "To"
                                               'drop-first-name)
                  (mailclient-gather-addresses "cc"  )
diff --git a/lisp/mail/mailheader.el b/lisp/mail/mailheader.el
index 0db4df063e3..936f53e96a5 100644
--- a/lisp/mail/mailheader.el
+++ b/lisp/mail/mailheader.el
@@ -23,7 +23,7 @@
 
 ;;; Commentary:
 
-;; This package provides an abstraction to RFC822-style messages, used in
+;; This package provides an abstraction of RFC 822 (or later) format, used in
 ;; mail, news, and some other systems.  The simple syntactic rules for such
 ;; headers, such as quoting and line folding, are routinely reimplemented
 ;; in many individual packages.  This package removes the need for this
diff --git a/lisp/mail/rfc2047.el b/lisp/mail/rfc2047.el
index 95f9f8ce0ad..118ca8a4c9b 100644
--- a/lisp/mail/rfc2047.el
+++ b/lisp/mail/rfc2047.el
@@ -338,7 +338,7 @@ The buffer may be narrowed."
 
 ;; Use this syntax table when parsing into regions that may need
 ;; encoding.  Double quotes are string delimiters, backslash is
-;; character quoting, and all other RFC 2822 special characters are
+;; character quoting, and all other RFC 822 (or later) special characters are
 ;; treated as punctuation so we can use forward-sexp/forward-word to
 ;; skip to the end of regions appropriately.  Nb. ietf-drums does
 ;; things differently.
@@ -366,7 +366,7 @@ The buffer may be narrowed."
 
 (defun rfc2047-encode-region (b e &optional dont-fold)
   "Encode words in region B to E that need encoding.
-By default, the region is treated as containing RFC2822 addresses.
+By default, the region is treated as containing RFC 822 (or later) addresses.
 Dynamically bind `rfc2047-encoding-type' to change that."
   (save-restriction
     (narrow-to-region b e)
@@ -403,7 +403,7 @@ Dynamically bind `rfc2047-encoding-type' to change that."
         (with-syntax-table rfc2047-syntax-table
           (goto-char (point-min))
           (condition-case err           ; in case of unbalanced quotes
-              ;; Look for rfc2822-style: sequences of atoms, quoted
+              ;; Look for RFC 822 (or later) style: sequences of atoms, quoted
               ;; strings, specials, whitespace.  (Specials mustn't be
               ;; encoded.)
               (while (not (eobp))
@@ -1025,7 +1025,7 @@ other than `\"' and `\\' in quoted strings."
               (replace-match " "))
             (setq end (point-max))
             ;; Quote decoded words if there are special characters
-            ;; which might violate RFC2822.
+            ;; which might violate RFC 822 (or later).
             (when (and rfc2047-quote-decoded-words-containing-tspecials
                        (let ((regexp (car (rassq
                                            'address-mime
diff --git a/lisp/mail/rfc822.el b/lisp/mail/rfc822.el
index 594416f12d7..a53a77e47ee 100644
--- a/lisp/mail/rfc822.el
+++ b/lisp/mail/rfc822.el
@@ -1,4 +1,4 @@
-;;; rfc822.el --- hairy rfc822 parser for mail and news and suchlike
+;;; rfc822.el --- hairy RFC 822 (or later) parser for mail, news, etc.
 
 ;; Copyright (C) 1986-1987, 1990, 2001-2019 Free Software Foundation,
 ;; Inc.
@@ -24,8 +24,8 @@
 
 ;;; Commentary:
 
-;; Support functions for parsing RFC-822 headers, used by mail and news
-;; modes.
+;; Support functions for parsing headers used by mail and news modes.
+;; The header format is specified by Internet RFC 822 and its successors.
 
 ;;; Code:
 
diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el
index 0f89e0e0386..36821e83e0d 100644
--- a/lisp/mail/rmail.el
+++ b/lisp/mail/rmail.el
@@ -779,8 +779,8 @@ The first parenthesized expression should match the MIME-charset name.")
     (concat
      "From "
 
-     ;; Many things can happen to an RFC 822 mailbox before it is put into
-     ;; a `From' line.  The leading phrase can be stripped, e.g.
+     ;; Many things can happen to an RFC 822 (or later) mailbox before it is
+     ;; put into a `From' line.  The leading phrase can be stripped, e.g.
      ;; `Joe <@w.x:joe@y.z>' -> `<@w.x:joe@y.z>'.  The <> can be stripped, e.g.
      ;; `<@x.y:joe@y.z>' -> `@x.y:joe@y.z'.  Everything starting with a CRLF
      ;; can be removed, e.g.
@@ -1003,8 +1003,8 @@ If `rmail-display-summary' is non-nil, make a summary for this RMAIL file."
   "Report that the buffer is not in the mbox file format.
 MSGNUM, if present, indicates the malformed message."
   (if msgnum
-      (error "Message %d is not a valid RFC2822 message" msgnum)
-    (error "Message is not a valid RFC2822 message")))
+      (error "Message %d is not a valid RFC 822 (or later) message" msgnum)
+    (error "Message is not a valid RFC 822 (or later) message")))
 
 (defun rmail-convert-babyl-to-mbox ()
   "Convert the mail file from Babyl version 5 to mbox.
@@ -2148,9 +2148,9 @@ Call with point at the end of the message."
     (insert "\n")))
 
 (defun rmail-add-mbox-headers ()
-  "Validate the RFC2822 format for the new messages.
+  "Validate the RFC 822 (or later) format for the new messages.
 Point should be at the first new message.
-An error is signaled if the new messages are not RFC2822
+An error is signaled if the new messages are not RFC 822 (or later)
 compliant.
 Unless an Rmail attribute header already exists, add it to the
 new messages.  Return the number of new messages."
@@ -3915,9 +3915,9 @@ which is an element of rmail-msgref-vector."
              (setq tem (copy-sequence tem))
              (set-text-properties 0 (length tem) nil tem)
              (setq tem (copy-sequence tem))
-             ;; Use prin1 to fake RFC822 quoting
+             ;; Use prin1 to fake RFC 822 (or later) quoting
              (let ((field (prin1-to-string tem)))
-               ;; Wrap it in parens to make it a comment according to RFC822
+               ;; Wrap it in parens to make it a comment.
                (if date
                    (concat "(" field "'s message of " date ")")
                  (concat "(" field ")"))))))
@@ -3946,7 +3946,7 @@ which is an element of rmail-msgref-vector."
              (if message-id
                  ;; "<AA259@bar.edu> (message from Unix Loser on 1-Apr-89)"
                  (concat message-id " (" field ")")
-               ;; Wrap in parens to make it a comment, for RFC822.
+               ;; Wrap in parens to make it a comment.
                (concat "(" field ")")))))
         (t
          ;; If we can't kludge it simply, do it correctly
diff --git a/lisp/mail/sendmail.el b/lisp/mail/sendmail.el
index 9315d6ac627..93b6c90521b 100644
--- a/lisp/mail/sendmail.el
+++ b/lisp/mail/sendmail.el
@@ -150,7 +150,7 @@ Otherwise, let mailer send back a message to report errors."
       'smtpmail-send-it 'sendmail-query-once)
   "Function to call to send the current buffer as mail.
 The headers should be delimited by a line which is
-not a valid RFC822 header or continuation line,
+not a valid RFC 822 (or later) header or continuation line,
 that matches the variable `mail-header-separator'.
 This is used by the default mail-sending commands.  See also
 `message-send-mail-function' for use with the Message package."
@@ -908,7 +908,7 @@ the user from the mailer."
             (ml (when mail-mailing-lists
                 ;; The surrounding regexp assumes the use of
                 ;; `mail-strip-quoted-names' on addresses before matching
-                ;; Cannot deal with full RFC 822 freedom, but that is
+                ;; Cannot deal with full RFC 822 (or later), but that is
                 ;; unlikely to be problematic.
                 (concat "\\(?:[[:space:];,]\\|\\`\\)"
                         (regexp-opt mail-mailing-lists t)
@@ -1044,7 +1044,7 @@ This function does not perform RFC2047 encoding."
                  (fullname-end (point-marker)))
              (goto-char fullname-start)
              ;; Look for a character that cannot appear unquoted
-             ;; according to RFC 822.
+             ;; according to RFC 822 (or later).
              (if (or (re-search-forward "[^- !#-'*+/-9=?A-Z^-~]"
                                         fullname-end 1)
                      quote-fullname)
@@ -1068,8 +1068,7 @@ This function does not perform RFC2047 encoding."
                  (insert "\""))
              (let ((fullname-end (point-marker)))
                (goto-char fullname-start)
-               ;; RFC 822 says \ and nonmatching parentheses
-               ;; must be escaped in comments.
+               ;; \ and nonmatching parentheses must be escaped in comments.
                ;; Escape every instance of ()\ ...
                (while (re-search-forward "[()\\]" fullname-end 1)
                  (replace-match "\\\\\\&" t))
diff --git a/lisp/mail/smtpmail.el b/lisp/mail/smtpmail.el
index 49645aba7a1..f31e0b45d20 100644
--- a/lisp/mail/smtpmail.el
+++ b/lisp/mail/smtpmail.el
@@ -259,7 +259,7 @@ for `smtpmail-try-auth-method'.")
                                (fullname-end (point-marker)))
                            (goto-char fullname-start)
                            ;; Look for a character that cannot appear unquoted
-                           ;; according to RFC 822.
+                           ;; according to RFC 822 or its successors.
                            (if (re-search-forward "[^- !#-'*+/-9=?A-Z^-~]"
                                                   fullname-end 1)
                                (progn
@@ -277,8 +277,9 @@ for `smtpmail-try-auth-method'.")
                            (insert fullname)
                            (let ((fullname-end (point-marker)))
                              (goto-char fullname-start)
-                             ;; RFC 822 says \ and nonmatching parentheses
-                             ;; must be escaped in comments.
+                             ;; RFC 822 and its successors say \ and
+                             ;; nonmatching parentheses must be
+                             ;; escaped in comments.
                              ;; Escape every instance of ()\ ...
                              (while (re-search-forward "[()\\]" fullname-end 1)
                                (replace-match "\\\\\\&" t))
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)
diff --git a/lisp/man.el b/lisp/man.el
index 767e8622b8e..b1d0fd3d17c 100644
--- a/lisp/man.el
+++ b/lisp/man.el
@@ -318,7 +318,7 @@ This regular expression should start with a `^' character.")
 
 (defvar Man-reference-regexp
   (concat "\\(" Man-name-regexp
-          "\\(‐?\n[ \t]+" Man-name-regexp "\\)*\\)[ \t]*(\\("
+          "\\(\\([-‐]\n\\)?[ \t]+" Man-name-regexp "\\)*\\)[ \t]*(\\("
           Man-section-regexp "\\))")
   "Regular expression describing a reference to another manpage.")
 
@@ -664,7 +664,7 @@ and the `Man-section-translations-alist' variables)."
      ;; "chmod(2V)" case ?
      ((string-match (concat "^" Man-reference-regexp "$") ref)
       (setq name (replace-regexp-in-string "[\n\t ]" "" (match-string 1 ref))
-            section (match-string 3 ref)))
+            section (match-string 4 ref)))
      ;; "2v chmod" case ?
      ((string-match (concat "^\\(" Man-section-regexp
                             "\\) +\\(" Man-name-regexp "\\)$") ref)
@@ -783,11 +783,22 @@ POS defaults to `point'."
       ;;     see this-
       ;;     command-here(1)
       ;; Note: This code gets executed iff our entry is after POS.
-      (when (looking-at "‐?[ \t\r\n]+\\([-a-zA-Z0-9._+:]+\\)([0-9])")
-        (setq word (concat word (match-string-no-properties 1)))
+      (when (looking-at
+             (concat
+              "‐?[ \t\r\n]+\\([-a-zA-Z0-9._+:]+\\)(" Man-section-regexp ")"))
+        (let ((1st-part word))
+          (setq word (concat word (match-string-no-properties 1)))
+          ;; If they use -Tascii, we cannot know whether a hyphen at
+          ;; EOL is or isn't part of the referenced manpage name.
+          ;; Heuristics: if the part of the manpage before the hyphen
+          ;; doesn't include a hyphen, we consider the hyphen to be
+          ;; added by troff, and remove it.
+          (or (not (eq (string-to-char (substring 1st-part -1)) ?-))
+              (string-match-p "-" (substring 1st-part 0 -1))
+              (setq word (replace-regexp-in-string "-" "" word))))
         ;; Make sure the section number gets included by the code below.
         (goto-char (match-end 1)))
-      (when (string-match "[-._]+$" word)
+      (when (string-match "[-._‐]+$" word)
         (setq word (substring word 0 (match-beginning 0))))
       ;; The following was commented out since the preceding code
       ;; should not produce a leading "*" in the first place.
diff --git a/lisp/mh-e/mh-e.el b/lisp/mh-e/mh-e.el
index 3ff7765f395..bc09764656b 100644
--- a/lisp/mh-e/mh-e.el
+++ b/lisp/mh-e/mh-e.el
@@ -2420,14 +2420,14 @@ of citations entirely, choose \"None\"."
   :package-version '(MH-E . "8.0"))
 
 ;; These entries have been intentionally excluded by the developers.
-;;  "Comments:"                         ; RFC 2822 - show this one
+;;  "Comments:"                         ; RFC 822 (or later) - show this one
 ;;  "Fax:"                              ; http://people.dsv.su.se/~jpalme/ietf/mail-headers/
 ;;  "Mail-System-Version:"              ; http://people.dsv.su.se/~jpalme/ietf/mail-headers/
 ;;  "Mailer:"                           ; http://people.dsv.su.se/~jpalme/ietf/mail-headers/
 ;;  "Organization:"                     ;
 ;;  "Phone:"                            ; http://people.dsv.su.se/~jpalme/ietf/mail-headers/
 ;;  "Reply-By:"                         ; RFC 2156
-;;  "Reply-To:"                         ; RFC 2822
+;;  "Reply-To:"                         ; RFC 822 (or later)
 ;;  "Sender:"                           ;
 ;;  "User-Agent:"                       ; Similar to X-Mailer, so display it.
 ;;  "X-Mailer:"                         ;
@@ -2488,9 +2488,9 @@ of citations entirely, choose \"None\"."
     "From "                             ; sendmail
     "Generate-Delivery-Report:"         ; RFC 2156
     "Importance:"                       ; RFC 2156, 2421
-    "In-Reply-To:"                      ; RFC 2822
+    "In-Reply-To:"                      ; RFC 822 (or later)
     "Incomplete-Copy:"                  ; RFC 2156
-    "Keywords:"                         ; RFC 2822
+    "Keywords:"                         ; RFC 822 (or later)
     "Language:"                         ; RFC 2156
     "Lines:"                            ; RFC 1036
     "List-"                             ; RFC 2369, 2919
@@ -2500,7 +2500,7 @@ of citations entirely, choose \"None\"."
     "Mail-Reply-To:"                    ; http://people.dsv.su.se/~jpalme/ietf/mail-headers/
     "Mailing-List:"                     ; Egroups/yahoogroups mailing list manager
     "Message-Content:"                  ; http://people.dsv.su.se/~jpalme/ietf/mail-headers/
-    "Message-Id:"                       ; RFC 822
+    "Message-ID:"                       ; RFC 822 (or later)
     "Message-Type:"                     ; RFC 2156
     "Mime-Version"                      ; RFC 2045
     "Msgid:"
@@ -2531,14 +2531,14 @@ of citations entirely, choose \"None\"."
     "Priority:"                         ; RFC 2156
     "Read-Receipt-To:"                  ; http://people.dsv.su.se/~jpalme/ietf/mail-headers/
     "Received-SPF:"                     ; Gmail
-    "Received:"                         ; RFC 822
-    "References:"                       ; RFC 2822
+    "Received:"                         ; RFC 822 (or later)
+    "References:"                       ; RFC 822 (or later)
     "Registered-Mail-Reply-Requested-By:"       ; http://people.dsv.su.se/~jpalme/ietf/mail-headers/
     "Remailed-"                         ; MH
     "Replaces:"                         ; http://people.dsv.su.se/~jpalme/ietf/mail-headers/
     "Replied:"                          ; MH
-    "Resent-"                           ; RFC 2822
-    "Return-Path:"                      ; RFC 822
+    "Resent-"                           ; RFC 822 (or later)
+    "Return-Path:"                      ; RFC 822 (or later)
     "Return-Receipt-Requested:"         ; http://people.dsv.su.se/~jpalme/ietf/mail-headers/
     "Return-Receipt-To:"                ; http://people.dsv.su.se/~jpalme/ietf/mail-headers/
     "Seal-Send-Time:"
diff --git a/lisp/mh-e/mh-utils.el b/lisp/mh-e/mh-utils.el
index 9526338b8ff..cad62787190 100644
--- a/lisp/mh-e/mh-utils.el
+++ b/lisp/mh-e/mh-utils.el
@@ -888,7 +888,7 @@ in this situation."
 ;;;###mh-autoload
 (defun mh-header-field-beginning ()
   "Move to the beginning of the current header field.
-Handles RFC 822 continuation lines."
+Handle RFC 822 (or later) continuation lines."
   (beginning-of-line)
   (while (looking-at "^[ \t]")
     (forward-line -1)))
@@ -896,7 +896,7 @@ Handles RFC 822 continuation lines."
 ;;;###mh-autoload
 (defun mh-header-field-end ()
   "Move to the end of the current header field.
-Handles RFC 822 continuation lines."
+Handle RFC 822 (or later) continuation lines."
   (forward-line 1)
   (while (looking-at "^[ \t]")
     (forward-line 1))
diff --git a/lisp/minibuffer.el b/lisp/minibuffer.el
index cc87ffaced5..9fe961d748c 100644
--- a/lisp/minibuffer.el
+++ b/lisp/minibuffer.el
@@ -174,10 +174,14 @@ ACTION can be one of nil, t or `lambda'."
 
 (defun completion-table-dynamic (fun &optional switch-buffer)
   "Use function FUN as a dynamic completion table.
-FUN is called with one argument, the string for which completion is required,
-and it should return an alist containing all the intended possible completions.
-This alist may be a full list of possible completions so that FUN can ignore
-the value of its argument.
+FUN is called with one argument, the string for which completion is requested,
+and it should return a completion table containing all the intended possible
+completions.
+This table is allowed to include elements that do not actually match the
+string: they will be automatically filtered out.
+The completion table returned by FUN can use any of the usual formats of
+completion tables such as lists, alists, and hash-tables.
+
 If SWITCH-BUFFER is non-nil and completion is performed in the
 minibuffer, FUN will be called in the buffer from which the minibuffer
 was entered.
@@ -185,6 +189,8 @@ was entered.
 The result of the `completion-table-dynamic' form is a function
 that can be used as the COLLECTION argument to `try-completion' and
 `all-completions'.  See Info node `(elisp)Programmed Completion'.
+The completion table returned by `completion-table-dynamic' has empty
+metadata and trivial boundaries.
 
 See also the related function `completion-table-with-cache'."
   (lambda (string pred action)
diff --git a/lisp/net/imap.el b/lisp/net/imap.el
index 0931252c366..bc0e2e609aa 100644
--- a/lisp/net/imap.el
+++ b/lisp/net/imap.el
@@ -2076,23 +2076,23 @@ Return nil if no complete line has arrived."
 ;;                      addr-host ")"
 ;;
 ;;   addr-adl        = nstring
-;;                       ; Holds route from [RFC-822] route-addr if
+;;                       ; Holds route from [RFC-822 (or later)] route-addr if
 ;;                       ; non-nil
 ;;
 ;;   addr-host       = nstring
-;;                       ; nil indicates [RFC-822] group syntax.
-;;                       ; Otherwise, holds [RFC-822] domain name
+;;                       ; nil indicates [RFC-822 (or later)] group syntax.
+;;                       ; Otherwise, holds [RFC-822 (or later)] domain name
 ;;
 ;;   addr-mailbox    = nstring
-;;                       ; nil indicates end of [RFC-822] group; if
+;;                       ; nil indicates end of [RFC-822 (or later)] group; if
 ;;                       ; non-nil and addr-host is nil, holds
-;;                       ; [RFC-822] group name.
-;;                       ; Otherwise, holds [RFC-822] local-part
-;;                       ; after removing [RFC-822] quoting
+;;                       ; [RFC-822 (or later)] group name.
+;;                       ; Otherwise, holds [RFC-822 (or later)] local-part
+;;                       ; after removing [RFC-822 (or later)] quoting
 ;;
 ;;   addr-name       = nstring
-;;                       ; If non-nil, holds phrase from [RFC-822]
-;;                       ; mailbox after removing [RFC-822] quoting
+;;                       ; If non-nil, holds phrase from [RFC-822 (or later)]
+;;                       ; mailbox after removing [RFC-822 (or later)] quoting
 ;;
 
 (defsubst imap-parse-address ()
diff --git a/lisp/net/newst-backend.el b/lisp/net/newst-backend.el
index ac58ed9fa7e..9ff4649fee0 100644
--- a/lisp/net/newst-backend.el
+++ b/lisp/net/newst-backend.el
@@ -1691,8 +1691,8 @@ Examples:
     nil))
 
 (defun newsticker--decode-rfc822-date (rfc822-string)
-  "Return RFC822-STRING in format like `decode-time'.
-Converts from RFC822 to Emacs representation.
+  "Convert RFC822-STRING to a Lisp timestamp.
+RFC822-STRING should use RFC 822 (or later) format.
 Examples:
 Sat, 07 September 2002 00:00:01 +0100
 Sat, 07 September 2002 00:00:01 MET
diff --git a/lisp/org/org-id.el b/lisp/org/org-id.el
index 670abad17f3..6a9d729c0a4 100644
--- a/lisp/org/org-id.el
+++ b/lisp/org/org-id.el
@@ -160,9 +160,9 @@ to have no space characters in them."
 (defcustom org-id-include-domain nil
   "Non-nil means add the domain name to new IDs.
 This ensures global uniqueness of IDs, and is also suggested by
-RFC 2445 in combination with RFC 822.  This is only relevant if
-`org-id-method' is `org'.  When uuidgen is used, the domain will never
-be added.
+the relevant RFCs.  This is relevant only if `org-id-method' is
+`org'.  When uuidgen is used, the domain will never be added.
+
 The default is to not use this because we have no really good way to get
 the true domain, and Org entries will normally not be shared with enough
 people to make this necessary."
diff --git a/lisp/ps-samp.el b/lisp/ps-samp.el
index ff472546eec..784b4356b47 100644
--- a/lisp/ps-samp.el
+++ b/lisp/ps-samp.el
@@ -76,8 +76,8 @@
       (concat "Subject: " (or (mail-fetch-field "Subject") "???")))))
 
 ;; Look in an article or mail message for the From: line.  Sorta-kinda
-;; understands RFC-822 addresses and can pull the real name out where
-;; it's provided.
+;; understands RFC 822 (or later) addresses and can pull the real name
+;; out where it's provided.
 (defun ps-article-author ()
   (save-excursion
     (save-restriction
diff --git a/lisp/simple.el b/lisp/simple.el
index a9cab5a5066..d4ae5ebb1f9 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -7834,7 +7834,7 @@ appears to have customizations applying to the old default,
   "If the buffer starts with a mail header, move point to the header's end.
 Otherwise, moves to `point-min'.
 The end of the header is the start of the next line, if there is one,
-else the end of the last line.  This function obeys RFC822."
+else the end of the last line.  This function obeys RFC 822 (or later)."
   (goto-char (point-min))
   (when (re-search-forward
          "^\\([:\n]\\|[^: \t\n]+[ \t\n]\\)" nil 'move)
diff --git a/lisp/url/url-util.el b/lisp/url/url-util.el
index c2baa69d5a9..1d0ecb4436a 100644
--- a/lisp/url/url-util.el
+++ b/lisp/url/url-util.el
@@ -74,7 +74,8 @@ If a list, it is a list of the types of messages to be logged."
 
 ;;;###autoload
 (defun url-parse-args (str &optional nodowncase)
-  ;; Return an assoc list of attribute/value pairs from an RFC822-type string
+  ;; Return an assoc list of attribute/value pairs from a string
+  ;; that uses RFC 822 (or later) format.
   (let (
         name                            ; From name=
         value                           ; its value
diff --git a/src/w32term.c b/src/w32term.c
index 6fc86124199..bdd02d05400 100644
--- a/src/w32term.c
+++ b/src/w32term.c
@@ -6733,7 +6733,10 @@ x_make_frame_visible (struct frame *f)
     }
 
   if (!FLOATP (Vx_wait_for_event_timeout))
+    {
+      unblock_input ();
       return;
+    }
 
   /* Synchronize to ensure Emacs knows the frame is visible
      before we do anything else.  We do this loop with input not blocked