Merge from origin/emacs-25

d841a03 ; Spelling fix
a6ae479 Post AppDefined events from the main thread ONLY (bug#23934)
d35d398 Update to the AUTHORS file for Bob Weiner
4d2f4df Revert "Fix local printer set to left aligned string formatter."
cd1b4d6 Revert "Fix ses-delete-blanks to delete only blanks + documen...
f7ceb8e Revert "Fix English."
baa7abd Improve doc strings of 'gud-gdb' and 'gdb'
aa4271a Fix doc string of 'minibuffer-message-timeout'
b275cc7 Fix English.
3c97b0f Fix ses-delete-blanks to delete only blanks + documentation.
272391f profiler: document prefix arg for tree expansion
442cc39 Clarify usage of eshell-visual-options
b443c3c Fix comment in files-in-below-directory
8a38e94 Fix local printer set to left aligned string formatter.
0f0b191 ; Fix typos in NEWS
6bdf687 ; * etc/NEWS: Remove temporary marks

12 files changed, 39 insertions, 381 deletions

diff --git a/doc/lispintro/emacs-lisp-intro.texi b/doc/lispintro/emacs-lisp-intro.texi
index 10162b35467..86c8da0e461 100644
--- a/doc/lispintro/emacs-lisp-intro.texi
+++ b/doc/lispintro/emacs-lisp-intro.texi
@@ -15465,7 +15465,7 @@ Here is the function:
 @group
       (cond
        ;; check to see whether filename ends in '.el'
-       ;; and if so, append its name to a list.
+       ;; and if so, add its name to a list.
        ((equal ".el" (substring (car (car current-directory-list)) -3))
         (setq el-files-list
               (cons (car (car current-directory-list)) el-files-list)))
diff --git a/doc/lispref/debugging.texi b/doc/lispref/debugging.texi
index 98c47052cb0..2f83b4040fa 100644
--- a/doc/lispref/debugging.texi
+++ b/doc/lispref/debugging.texi
@@ -840,8 +840,9 @@ called, followed by how much resource (processor or memory) it used in
 absolute and percentage times since profiling started.  If a given
 line has a @samp{+} symbol at the left-hand side, you can expand that
 line by typing @key{RET}, in order to see the function(s) called by
-the higher-level function.  Pressing @key{RET} again will collapse
-back to the original state.
+the higher-level function.  Use a prefix argument (@key{C-u RET}) to
+see the whole call tree below a function.  Pressing @key{RET} again
+will collapse back to the original state.
 
 Press @kbd{j} or @kbd{mouse-2} to jump to the definition of a function.
 Press @kbd{d} to view a function's documentation.
diff --git a/etc/AUTHORS b/etc/AUTHORS
index 36b26046ec6..8272009639c 100644
--- a/etc/AUTHORS
+++ b/etc/AUTHORS
@@ -486,7 +486,7 @@ Bob Rogers: changed vc-dir.el vc-svn.el cperl-mode.el diff.el ewoc.el
   ffap.el files.el maintaining.texi sql.el thingatpt.el vc.el
   vc1-xtra.texi
 
-Bob Weiner: changed info.el quail.el
+Bob Weiner: changed dframe.el etags.c info.el rmail.el rmailsum.el speedbar.el
 
 Bojan Petrovic: changed pop3.el
 
diff --git a/etc/NEWS b/etc/NEWS
index 44f37b8d98f..04c293dfc7c 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -15,13 +15,6 @@ and NEWS.1-17 for changes in older Emacs versions.
 You can narrow news to a specific version by calling 'view-emacs-news'
 with a prefix argument or by typing C-u C-h C-n.
 
-Temporary note:
-+++ indicates that all necessary documentation updates are complete.
-    (This means all relevant manuals in doc/ AND lisp doc-strings.)
---- means no change in the manuals is needed.
-When you add a new item, use the appropriate mark if you are sure it applies,
-otherwise leave it unmarked.
-
 
 * Installation Changes in Emacs 25.2
 
@@ -591,13 +584,10 @@ file names into backslashes.  It no longer does that.
 
 * Installation Changes in Emacs 25.1
 
-+++
 ** Building Emacs now requires C99 or later.
 
-+++
 ** Building Emacs now requires GNU make, version 3.81 or later.
 
-+++
 ** New configure option --with-cairo.
 This builds Emacs with Cairo drawing.  As a side effect, it provides
 support for built-in printing, when Emacs was built with GTK+.
@@ -606,11 +596,9 @@ display problems.  We encourage more testing of this build and
 reporting any problems you find, but it is not recommended for
 production.
 
-+++
 ** New configure option --with-modules.
 This enables support for loading dynamic modules; see below.
 
----
 ** By default, Emacs no longer works on IRIX.  We expect that Emacs
 users are not affected by this, as SGI stopped supporting IRIX in
 December 2013.  If you are affected, please send a bug report.  You
@@ -618,60 +606,49 @@ should be able to work around the problem either by porting the Emacs
 undumping code to GCC under IRIX, or by configuring --with-wide-int,
 or by sticking with Emacs 24.4.
 
----
 ** The Emacs garbage collector assumes GC_MARK_STACK == GC_MAKE_GCPROS_NOOPS.
 The GC_MAKE_GCPROS_NOOPS stack-marking variant has been the default
 since Emacs 24.4, and the other variants were undocumented and were
 obstacles to maintenance and development.  GC_MARK_STACK and its
 related symbols have been removed from the C internals.
 
----
 ** 'configure' now prefers gnustep-config when configuring GNUstep.
 If gnustep-config is not available, the old heuristics are used.
 
----
 ** 'configure' now prefers inotify to gfile for file notification,
 unless gfile is explicitly requested via --with-file-notification='gfile'.
 
----
 ** 'configure' detects the kqueue file notification library on *BSD
 and Mac OS X machines.
 
----
 ** The configure option '--with-pkg-config-prog' has been removed.
 Use './configure PKG_CONFIG=/full/name/of/pkg-config' if you need to.
 
----
 ** The configure option '--with-mmdf' has been removed.
 It was no longer useful, as it relied on libraries that are no longer
 supported, and its presence led to confusion during configuration.
 This affects only the 'movemail' utility; Emacs itself can still
 process MMDF-format files as before.
 
-+++
 ** The configure option '--enable-silent-rules' is now the default,
 and silent rules are now quieter.  To get the old behavior where
 'make' chatters a lot, configure with '--disable-silent-rules' or
 build with 'make V=1'.
 
----
 ** The configure option '--with-gameuser' now allows you to specify a
 group instead of a user if its argument is prefixed by ':' (a colon).
 This will cause the game score files in "${localstatedir}/games/emacs"
 to be owned by that group, and the helper program for updating them to
 be installed setgid.  The option now defaults to the 'games' group.
 
----
 ** The 'grep-changelog' script (and its manual page) are no longer included.
 It has no particular connection to Emacs and has not changed in years,
 so if you want to use it, you can always take a copy from an older Emacs.
 
----
 ** Emacs 25 comes with a new set of icons.
 Various resolutions are available as etc/images/icons/hicolor/*/apps/emacs.png.
 The old Emacs logo icons are available as 'emacs23.png' in the same location.
 
----
 ** New make target 'check-expensive' to run additional tests.
 This includes all tests which run via "make check", plus additional
 tests which take more time to perform.
@@ -679,7 +656,6 @@ tests which take more time to perform.
 
 * Startup Changes in Emacs 25.1
 
-+++
 ** When Emacs is given a file as a command line argument and
 'initial-buffer-choice' is non-nil, display both the file and
 'initial-buffer-choice'.  When Emacs is given more than one file and
@@ -687,11 +663,9 @@ tests which take more time to perform.
 and '*Buffer List*'.  This makes Emacs convenient to use from the
 command line when 'initial-buffer-choice' is non-nil.
 
-+++
 ** The value of 'initial-scratch-message' is now treated as a doc string
 and can contain escape sequences for command keys, quotes, and the like.
 
----
 ** The default height of GUI frames was enlarged.
 This is so there's enough space in the initial window to display the
 optional text about recovering crashes sessions, without losing the
@@ -700,7 +674,6 @@ splash image display.
 
 * Changes in Emacs 25.1
 
-+++
 ** Xwidgets: a new feature for embedding native widgets inside Emacs buffers.
 If you have gtk3 and webkitgtk3 installed, and Emacs was built with
 xwidget support, you can access the embedded webkit browser with 'M-x
@@ -708,7 +681,6 @@ xwidget-webkit-browse-url'.  This opens a new buffer with the embedded
 browser.  The buffer will have a new mode, 'xwidget-webkit-mode'
 (similar to 'image-mode'), which supports the webkit widget.
 
-+++
 *** New functions for xwidget-webkit mode 'xwidget-webkit-insert-string',
 'xwidget-webkit-adjust-size-dispatch', 'xwidget-webkit-back',
 'xwidget-webkit-browse-url', 'xwidget-webkit-reload',
@@ -716,7 +688,6 @@ browser.  The buffer will have a new mode, 'xwidget-webkit-mode'
 'xwidget-webkit-scroll-forward', 'xwidget-webkit-scroll-down',
 'xwidget-webkit-scroll-up'.
 
-+++
 ** Emacs can now load shared/dynamic libraries (modules).
 A dynamic Emacs module is a shared library that provides additional
 functionality for use in Emacs Lisp programs, just like a package
@@ -754,15 +725,12 @@ change in future releases.  For that reason, their support is disabled
 by default, and must be enabled by using the '--with-modules' option
 at configure time.
 
-+++
 ** Network security (TLS/SSL certificate validity and the like) is
 added via the new Network Security Manager (NSM) and controlled via
 the 'network-security-level' variable.
 
-+++
 ** 'C-h l' now also lists the commands that were run.
 
-+++
 ** 'x-select-enable-clipboard' is renamed 'select-enable-clipboard'
 and 'x-select-enable-primary' is renamed 'select-enable-primary'.
 Additionally they both now apply to all systems (OSX, GNUstep, Windows, you
@@ -770,38 +738,30 @@ name it), with the proviso that on some systems (e.g. Windows)
 'select-enable-primary' is ineffective since the system doesn't
 have the equivalent of a primary selection.
 
-+++
 ** New option 'switch-to-buffer-in-dedicated-window' allows you to
 customize how 'switch-to-buffer' proceeds interactively when the
 selected window is strongly dedicated to its buffer.
 
-+++
 ** The option 'even-window-heights' has been renamed to
 'even-window-sizes' and now handles window widths as well.
 
-+++
 ** 'terpri' gets an optional arg ENSURE to conditionally output a newline.
 
-+++
 ** 'insert-register' now leaves point after the inserted text
 when called interactively.  A prefix argument toggles this behavior.
 
-+++
 ** The new variable 'term-file-aliases' replaces some files from lisp/term.
 The function 'tty-run-terminal-initialization' consults this variable
 when deciding what terminal-specific initialization code to run.
 
----
 ** New variable 'system-configuration-features', listing some of the
 main features that Emacs was compiled with.  This is mainly intended
 for use in Emacs bug reports.
 
-+++
 ** A password is now hidden also when typed in batch mode.  Another
 hiding character but the default '.' can be used by let-binding the
 variable 'read-hide-char'.
 
-+++
 ** The Emacs pseudo-random number generator can be securely seeded.
 On systems where Emacs can access the system entropy or some other
 cryptographically secure random stream, it now uses that when 'random'
@@ -809,51 +769,41 @@ is called with its argument t.  This allows cryptographically strong
 random values; in particular, the Emacs server now uses this facility
 to produce its authentication key.
 
----
 ** New input methods: 'tamil-dvorak', 'programmer-dvorak' and 'probhat'.
 
 
 * Editing Changes in Emacs 25.1
 
-+++
 ** 'M-x' suggests shorthands and ignores obsolete commands for completion.
 
 ** Changes in undo
 
-+++
 *** Successive single-char deletions are collapsed in the undo-log just like
 successive char insertions.  Which commands invoke this behavior is
 controlled by the new 'undo-auto-amalgamate' function.  See the node
 "Undo" in the ELisp manual for more details.
 
-+++
 *** The heuristic used to insert 'undo-boundary' after each command
 has changed, so that if a command causes changes in more than just the
 current buffer, Emacs now calls 'undo-boundary' in every buffer
 affected by the command.
 
-+++
 ** New command 'comment-line' bound to 'C-x C-;'.
 
 ** New and improved facilities for inserting Unicode characters
 
----
 *** Unicode names entered via 'C-x 8 RET' now use substring completion
 by default.
 
-+++
 *** 'C-x 8' now has shorthands for several chars, such as U+2010
 (HYPHEN), U+2011 (NON-BREAKING HYPHEN), and U+2012 (FIGURE DASH).  As
 before, you can type 'C-x 8 C-h' to list shorthands.
 
-+++
 *** New minor mode 'electric-quote-mode' for using curved quotes as you
 type.  See also the new variable 'text-quoting-style'.
 
----
 ** New minor mode 'global-eldoc-mode' is enabled by default.
 
----
 ** Emacs now uses "bracketed paste mode" on text terminals that support it.
 Bracketed paste mode causes text terminals to wrap pasted text in special
 escape sequences that allow Emacs to tell the difference between text
@@ -866,7 +816,6 @@ pasting large amounts of text.
 Bracketed paste mode is disabled by default, so Emacs automatically
 enables it at startup if the terminal supports it.
 
-+++
 ** Emacs now supports the latest version of the UBA.
 The Emacs implementation of the Unicode Bidirectional Algorithm (UBA)
 was updated to support all the latest additions and changes introduced
@@ -875,29 +824,23 @@ This includes full support for directional isolates and the
 Bidirectional Parentheses Algorithm (BPA) specified by these Unicode
 standards.
 
-+++
 ** You can access 'mouse-buffer-menu' ('C-down-mouse-1') using 'C-f10'.
 
-+++
 ** New buffer-local 'electric-pair-local-mode'.
 
-+++
 ** New variable 'fast-but-imprecise-scrolling' inhibits
 fontification during full screen scrolling operations, giving less
 hesitant operation during auto-repeat of 'C-v', 'M-v' at the cost of
 possible inaccuracies in the end position.
 
-+++
 ** New documentation command 'describe-symbol'.
 Works for functions, variables, faces, etc.  It is bound to 'C-h o' by
 default.
 
-+++
 ** New function 'custom-prompt-customize-unsaved-options' checks for
 unsaved customizations and prompts user to customize (if found).  It
 is intended for adding to 'kill-emacs-query-functions'.
 
-+++
 ** The old 'C-x w' bindings in 'hi-lock-mode' are officially deprecated
 in favor of the global 'M-s h' bindings introduced in Emacs 23.1.
 They'll disappear soon.
@@ -907,20 +850,17 @@ They'll disappear soon.
 
 ** Checkdoc
 
-+++
 *** New command 'checkdoc-package-keywords' checks if the
 current package keywords are recognized.  Set the new option
 'checkdoc-package-keywords-flag' to non-nil to make
 'checkdoc-current-buffer' call this function automatically.
 
-+++
 *** New function 'checkdoc-file' checks for style errors.
 It's meant for use together with 'compile':
 emacs -batch --eval "(checkdoc-file \"subr.el\")"
 
 ** Desktop
 
----
 *** The desktop format version has been upgraded from 206 to 208.
 Although Emacs 25.1 can read a version 206 desktop, earlier Emacsen
 cannot read a version 208 desktop.  To upgrade your desktop file, you
@@ -929,49 +869,41 @@ recommended to do this as soon as you have firmly upgraded to Emacs
 25.1 (or later).  Should you ever need to downgrade your desktop file
 to version 206, you can do this with 'C-u C-u M-x desktop-save'.
 
----
 *** 'desktop-restore-in-current-display' now defaults to t, not nil.
 That is, Emacs by default now restores frames into the current display.
 
-+++
 ** New function 'bookmark-set-no-overwrite' bound to 'C-x r M'.
 It raises an error if a bookmark of that name already exists,
 unlike 'bookmark-set' which silently updates an existing bookmark.
 
 ** Gnus
 
-+++
 *** New user options 'mm-html-inhibit-images' and 'mm-html-blocked-images'
 now control how mm-* functions fetch and display images in an HTML
 message.  Gnus still uses 'gnus-inhibit-images' and 'gnus-blocked-images'
 for that purpose, i.e., binds mm-html- variables with those gnus-
 variables, but other packages do not have to bind gnus- variables now.
 
----
 *** 'mm-inline-text-html-with-images' has been removed.
 Use 'mm-html-inhibit-images' instead.  Note that the value is opposite
 in meaning.
 
 ** IMAP
 
----
 *** 'imap-ssl-program' has been removed, and imap.el uses the internal
 GnuTLS encryption functions if possible.
 
 ** JSON
 
----
 *** 'json-pretty-print' and 'json-pretty-print-buffer' now maintain
 the ordering of object keys by default.
 
----
 *** New commands 'json-pretty-print-ordered' and
 'json-pretty-print-buffer-ordered' pretty prints JSON objects with
 object keys sorted alphabetically.
 
 ** Prettify Symbols mode
 
-+++
 *** Prettify Symbols mode supports custom composition predicates.  By
 overriding the default 'prettify-symbols-compose-predicate', modes can
 specify in which contexts a symbol may be displayed as some Unicode
@@ -979,13 +911,11 @@ character.  'prettify-symbols-default-compose-p' is the default which
 is suitable for most programming languages such as C or Lisp (but not
 (La)TeX).
 
-+++
 *** Symbols can be unprettified while point is inside them.
 New variable 'prettify-symbols-unprettify-at-point' configures this.
 
 ** Enhanced xterm support
 
----
 *** The new variable 'xterm-screen-extra-capabilities' for configuring xterm.
 This variable tells Emacs which advanced capabilities are available in
 the xterm terminal emulator used to display Emacs text-mode frames.
@@ -993,7 +923,6 @@ The default is to check each capability, and use it if available.
 (This variable was introduced in Emacs 24.1, but was not announced in
 its NEWS.)
 
----
 *** Killing text now also sets the CLIPBOARD/PRIMARY selection
 in the surrounding GUI (using the OSC-52 escape sequence).  This only works
 if your xterm supports it and enables the 'allowWindowOps' options (disabled
@@ -1003,10 +932,8 @@ Similarly, you can yank the CLIPBOARD/PRIMARY selection (using the OSC-52
 escape sequence) if your xterm has the feature enabled but for that you
 additionally need to add 'getSelection' to 'xterm-extra-capabilities'.
 
-+++
 *** 'xterm-mouse-mode' now supports mouse-tracking (if your xterm supports it).
 
----
 ** The way to turn on and off 'save-place' mode has changed.
 It is no longer sufficient to load the saveplace library and set
 'save-place' non-nil.  Instead, use the two new minor modes:
@@ -1018,22 +945,18 @@ obsolete alias for the new 'save-place-local-mode' command.
 
 ** ERC
 
-+++
 *** ERC can now hide message types by network or channel.
 'erc-hide-list' will hide all messages of the specified type, while
 'erc-network-hide-list' and 'erc-channel-hide-list' will only hide the
 specified message types for the respective specified targets.
 
----
 *** Reconnection is now asynchronous.
 
----
 *** Nick completion is now case-insensitive again after inadvertently
 being made case-sensitive in Emacs 24.2.
 
 ** MPC
 
----
 *** New commands, key binds, and menu items.
 
 **** '<' and '>' for navigating previous and next tracks in playlist
@@ -1046,29 +969,23 @@ track.
 **** New commands 'mpc-toggle-{consume,repeat,single,shuffle}' for
 toggling playback modes.
 
----
 *** Now supports connecting to a UNIX domain socket.
 
----
 *** Looks at more image file names to use as album art.
 Case-insensitively tries for .folder.png (freedesktop) and folder.jpg
 (XP) in addition to cover.jpg.
 
----
 *** Searches in more locations for MPD configuration files.
 MPD supports the XDG base directory specification since version 0.17.6.
 
 ** Midnight-mode
 
----
 *** 'midnight-mode' is now a proper minor mode.
 
----
 *** clean-buffer-*-regexps can now specify buffers via predicate functions.
 
 ** package.el
 
-+++
 *** New "external" package status.
 An external package is any installed package that's not built-in and
 not from 'package-user-dir', which usually means it's from an entry in
@@ -1080,12 +997,10 @@ The effect is that a user can manually place a specific version of a
 package inside 'package-directory-list' and the package menu will
 always respect that.
 
-+++
 *** If a package is available on multiple archives and one has higher
 priority (as per 'package-archive-priorities') only that one is
 listed.  This can be configured with 'package-menu-hide-low-priority'.
 
-+++
 *** 'package-menu-toggle-hiding' now toggles the hiding of packages.
 This includes the above-mentioned low-priority packages, as well as
 available packages whose version is lower than the currently installed
@@ -1093,48 +1008,38 @@ version (which were previously impossible to display).
 This allows users to downgrade a package if a lower version is
 available.
 
----
 *** When filtering the package menu, keywords starting with "arc:" or
 "status:" represent package archive or status, respectively, instead
 of actual keywords.
 
----
 *** Most functions which involve downloading information now take an
 ASYNC argument.  If it is non-nil, package.el performs the download(s)
 asynchronously.
 
----
 *** New variable 'package-menu-async' controls whether the
 package-menu uses asynchronous downloads.
 
----
 *** 'package-install-from-buffer' and 'package-install-file' work on directories.
 This follows the same rules as installing from a .tar file, except the
 -pkg file is optional.
 
----
 *** Packages which are dependencies of other packages cannot be deleted.
 The FORCE argument to 'package-delete' overrides this.
 
----
 *** New custom variable 'package-selected-packages' tracks packages
 which were installed by the user (as opposed to installed as
 dependencies).  This variable can also be manually customized.
 
----
 *** New command 'package-install-selected-packages' installs all
 packages from 'package-selected-packages' which are currently missing.
 
----
 *** 'package-install' function now takes a DONT-SELECT argument.  If
 this function is called interactively or if DONT-SELECT is nil, add the
 package being installed to 'package-selected-packages'.
 
----
 *** New command 'package-autoremove' removes all packages which were
 installed strictly as dependencies but are no longer needed.
 
-+++
 ** Shell
 
 When you invoke 'shell' interactively, the '*shell*' buffer will now
@@ -1145,40 +1050,29 @@ the old behavior -- '*shell*' buffer displays in current window -- use
      '("^\\*shell\\*$" . (display-buffer-same-window))).
 
 ** EIEIO
-+++
 *** The ':protection' slot option is not obeyed any more.
-+++
 *** The 'newname' argument to constructors is optional&deprecated.
 If you need your objects to be named, do it by inheriting from 'eieio-named'.
-+++
 *** The <class>-list-p and <class>-child-p functions are declared obsolete.
-+++
 *** The <class> variables are declared obsolete.
-+++
 *** The <initarg> variables are declared obsolete.
-+++
 *** defgeneric and defmethod are declared obsolete.
 Use the equivalent facilities from cl-generic.el instead.
-+++
 *** 'constructor' is now an obsolete alias for 'make-instance'.
----
 *** 'pcase' accepts a new UPattern 'eieio'.
 
 ** ido
 
-+++
 *** New command 'ido-bury-buffer-at-head' bound to 'C-S-b'.
 Bury the buffer at the head of 'ido-matches', analogous to how 'C-k'
 kills the buffer at head.
 
----
 *** A prefix argument to 'ido-restrict-to-matches' will reverse its
 meaning, and the list is restricted to those elements that do not
 match the current input.
 
 ** Minibuffer
 
-+++
 *** You can use <UP> and <DOWN> arrow keys to move through history by lines.
 The new commands 'next-line-or-history-element' and
 'previous-line-or-history-element', bound to <UP> and <DOWN> in the
@@ -1190,7 +1084,6 @@ item as before.
 
 ** Search and Replace
 
-+++
 *** 'isearch' and 'query-replace' can now perform character folding in matches.
 This is analogous to case folding, but instead of disregarding case
 variants, it disregards wider classes of distinctions between similar
@@ -1211,24 +1104,20 @@ folding in the middle of a search by typing 'M-s ''.
 'query-replace' honors character folding if the new variable
 'replace-char-fold' is customized to a non-nil value.
 
-+++
 *** New user option 'search-default-mode'.
 This option specifies the default mode for Isearch.  The default
 value, nil specifies that Isearch does literal searches (however,
 'case-fold-search' and 'isearch-lax-whitespace' may still be applied,
 as in previous Emacs versions).
 
-+++
 *** New function 'char-fold-to-regexp' can be used
 by searching commands to produce a regexp matching anything that
 char-folds into STRING.
 
-+++
 *** The new 'M-s M-w' key binding uses eww to search the web for the
 text in the region.  The search engine to use for this is specified by
 the customizable variable 'eww-search-prefix'.
 
-+++
 *** 'query-replace' history is enhanced.
 When 'query-replace' reads the FROM string from the minibuffer, typing
 'M-p' will now show previous replacements as "FROM SEP TO", where FROM
@@ -1239,26 +1128,21 @@ replacement appears in the minibuffer, and then exit the minibuffer by
 typing RET.
 
 ** Calc
-+++
 *** If 'quick-calc' is called with a prefix argument, insert the
 result of the calculation into the current buffer.
 
-+++
 ** In Edebug, you can now set the initial mode with 'C-x C-a C-m'.
 With this you can tell Edebug not to stop at the start of the first
 instrumented function.
 
 ** ElDoc
 
-+++
 *** New minor mode 'global-eldoc-mode'.
 It is turned on by default, and affects '*scratch*' and other buffers
 whose major mode supports Emacs Lisp.
 
----
 *** 'eldoc-documentation-function' now defaults to 'ignore'.
 
----
 *** 'describe-char-eldoc' displays information about character at point,
 and can be used as a default value of 'eldoc-documentation-function'.  It is
 useful when, for example, one needs to distinguish various spaces - e.g.,
@@ -1267,76 +1151,60 @@ using mono-spaced font.
 
 ** eww
 
----
 *** HTML can now be rendered using variable-width fonts.
 
-+++
 *** A new command 'F' ('eww-toggle-fonts') can be used to toggle
 whether to use variable-pitch fonts or not.  The user can also
 customize the 'shr-use-fonts' variable.
 
-+++
 *** A new command 'R' ('eww-readable') will try do identify the main
 textual parts of a web page and display only that, leaving menus and
 the like off the page.
 
-+++
 *** A new command 'D' ('eww-toggle-paragraph-direction') allows you to
 toggle the paragraph direction between left-to-right and right-to-left.
 
----
 *** You can now use several eww buffers in parallel by renaming eww
 buffers you want to keep separate.
 
-+++
 *** Partial state of the eww buffers (the URIs and the titles of the
 pages visited) is now preserved in the desktop file.
 
-+++
 *** 'eww-after-render-hook' is now called after eww has rendered
 the data in the buffer.
 
----
 *** The 'eww-reload' command now takes a prefix to not reload via
 the net, but just use the local copy of the HTML.
 
-+++
 *** The DOM shr and eww uses has been changed to the general Emacs
 xml.el/libxml2 DOM, and a new package dom.el has been added to
 interact with this DOM.  See the Emacs Lisp manual for interface
 details.
 
-+++
 *** 'mailcap-mime-data' is now consulted when displaying PDF files.
 
-+++
 *** The new 'S' command will list all eww buffers, and allow managing
 them.
 
----
 *** https pages with valid certificates have headers marked in green, while
 invalid certificates are marked in red.
 
 ** Message mode
 
----
 *** text/html messages that contain inline image parts will be
 transformed into multipart/related messages before sending.
 
-+++
 ** In Show Paren Mode, a parenthesis can be highlighted when point
 stands inside it, and certain parens can be highlighted when point is
 at BOL or EOL, or in whitespace there.  To enable these, customize,
 respectively, 'show-paren-when-point-inside-paren' or
 'show-paren-when-point-in-periphery'.
 
----
 ** If gpg2 exists on the system, it is now used as the default value
 of 'epg-gpg-program' (instead of gpg).
 
 ** Lisp mode
 
----
 *** Strings after ':documentation' are highlighted as docstrings.
 This enhances Lisp mode fontification to handle documentation of the
 form '(:documentation "the doc string")' used in Common Lisp code for
@@ -1344,19 +1212,15 @@ CLOS class and slot documentation.
 
 ** Rectangle editing
 
-+++
 *** Rectangle Mark mode can have corners past EOL or in the middle of a TAB.
 
-+++
 *** 'C-x C-x' in 'rectangle-mark-mode' now cycles through the four corners.
 *** 'string-rectangle' provides on-the-fly preview of the result.
 
-+++
 ** New font-lock functions 'font-lock-ensure' and 'font-lock-flush'.
 These should be used in preference to 'font-lock-fontify-buffer' when
 called from Lisp.
 
----
 ** Macro 'minibuffer-with-setup-hook' can optionally append a function
 to 'minibuffer-setup-hook'.
 
@@ -1365,39 +1229,30 @@ then FUN will be appended to 'minibuffer-setup-hook', instead of
 prepending it.
 
 ** cl-lib
-+++
 *** New functions 'cl-fresh-line', 'cl-digit-char-p', and 'cl-parse-integer'.
 
----
 *** 'pcase' accepts the new UPattern 'cl-struct'.
 
 ** Calendar and diary
 
-+++
 *** The default 'diary-file' is now located in "~/.emacs.d".
 
-+++
 *** New commands to insert diary entries with Chinese dates:
 'diary-chinese-insert-anniversary-entry' 'diary-chinese-insert-entry'
 'diary-chinese-insert-monthly-entry', 'diary-chinese-insert-yearly-entry'.
 
-+++
 *** The calendar can now list and mark diary entries with Chinese dates.
 See 'diary-chinese-list-entries' and 'diary-chinese-mark-entries'.
 
----
 *** The option 'calendar-mode-line-format' can now be nil,
 which means to do nothing special with the mode line in calendars.
 
-+++
 *** New option 'calendar-weekend-days'.
 The option customizes which day headers receive the
 'calendar-weekend-header' face.
 
----
 *** New optional args N and STRING for 'holiday-greek-orthodox-easter'.
 
----
 *** Many items obsolete since at least version 23.1 have been removed.
 The majority were function/variable/face aliases, too numerous to list here.
 The remainder were:
@@ -1413,68 +1268,54 @@ The remainder were:
 
 **** The nil and list forms of 'diary-display-function'.
 
-+++
 ** New ERT function 'ert-summarize-tests-batch-and-exit'.
 If the output of ERT tests in batch mode execution can be saved to a
 log file, then it can be passed as an argument to the above function
 to produce a neat summary.
 
----
 ** New js.el option 'js-indent-first-init'.
 
 ** Info
 
----
 ** Info mode now displays symbol names in fixed-pitch font.
 If you want to get the old behavior back, customize the 'Info-quoted'
 face to use the same definitions as the default face.
 
----
 *** 'Info-fontify-maximum-menu-size' can be t for no limit.
 
-+++
 *** 'info-display-manual' can now be given a prefix argument which (any
 non-nil value) directs the command to limit the completion
 alternatives to currently visited manuals.
 
----
 ** ntlm.el has support for NTLM2.
 
 ** Rmail
 
-+++
 *** The Rmail commands 'd', 'C-d' and 'u' take optional repeat counts
 to delete or undelete multiple messages.
 
-+++
 *** Rmail can now render HTML mail messages if your Emacs was built with
 libxml2 or if you have the Lynx browser installed.  By default, Rmail
 will display the HTML version of a mail message that has both HTML and
 plain text parts, if display of HTML email is possible; customize the
 'rmail-mime-prefer-html' option to nil if you don't want that.
 
-+++
 *** In the commands that make summaries by subject, recipients, or senders,
 you can no longer use commas to separate regular expressions.
 
-+++
 ** SES now supports local printer functions; see 'ses-define-local-printer'.
 
 ** Shell-script Mode
----
 *** In sh-mode you can now use 'sh-shell' as a file-local variable to
 specify the type of shell in use (bash, csh, etc).
 
----
 *** New value 'always' for 'sh-indent-after-continuation'.
 This provides old-style ("dumb") indentation of continued lines.
 See the doc string of 'sh-indent-after-continuation' for details.
 
 ** TLS
----
 *** Fatal TLS errors are now silent by default.
 
----
 *** If Emacs isn't built with TLS support, an external TLS-capable
 program is used instead.  This program used to be run in --insecure
 mode by default, but has now changed to be secure instead, and will
@@ -1483,85 +1324,68 @@ controlled by the 'tls-program' variable.
 
 ** URL
 
-+++
 *** The URL package accepts now the protocols "ssh", "scp" and "rsync".
 When 'url-handler-mode' is enabled, file operations for these
 protocols as well as for "telnet" and "ftp" are passed to Tramp.
 
-+++
 *** The URL package allows customizing the 'url-user-agent' string.
 The new 'url-user-agent' variable can be customized to be a string or
 a function.
 
----
 *** The new interface variable 'url-request-noninteractive' can be used
 to specify that we're running in a noninteractive context, and that
 we should not be queried about things like TLS certificate validity.
 
----
 *** 'url-mime-accept-string' can now be used as in "interface"
 variable, meaning you can bind it around an 'url-retrieve' call.
 
----
 *** If URL is used with a https connection, the first callback argument
 PLIST will contain a :peer element that has the output of
 'gnutls-peer-status' (if Emacs is built with GnuTLS support).
 
 ** Tramp
 
-+++
 *** New connection method "afp", which allows you to access Mac OS X
 volumes via the Apple Filing Protocol.
 
-+++
 *** New connection method "nc", which allows you to access dumb
 busyboxes.
 
-+++
 *** Method-specific parameters can be overwritten now with variable
 'tramp-connection-properties'.
 
----
 *** Handler for 'file-notify-valid-p' for remote machines that support
 filesystem notifications.
 
 ** SQL mode
 
----
 *** New user variable 'sql-default-directory' enables remote
 connections using Tramp.
 
----
 *** New command 'sql-send-line-and-next'.
 This command, bound to 'C-c C-n' by default, sends the current line to
 the SQL process and advances to the next line, skipping whitespace and
 comments.
 
----
 *** Added support for Vertica SQL.
 
 ** VC and related modes
 
-+++
 *** Basic push support, via 'vc-push', bound to 'C-x v P'.
 Implemented for Bzr, Git, Hg.  As part of this change, the pre-existing
 (undocumented) command 'vc-hg-push' now behaves slightly differently.
 
-+++
 *** The new command 'vc-region-history' shows the log+diff of the active region.
 
-+++
 *** You can refresh the VC state of a file buffer with 'M-x vc-refresh-state'.
 This command is useful when you perform version control commands
 outside Emacs (e.g., from the shell prompt), or if you switch the VC
 back-end for the buffer's file, or remove it from version control.
 
-+++
 *** New option 'vc-annotate-background-mode' controls whether
 the color range from 'vc-annotate-color-map' is applied to the
 background or to the foreground.
 
----
 *** New options for customizing encoding of Git commit log messages.
 The new user options 'vc-git-commits-coding-system' and
 'vc-git-log-output-coding-system' specify the encoding of log messages
@@ -1572,92 +1396,74 @@ i18n.commitEncoding and i18n.logOutputEncoding.
 ('vc-git-commits-coding-system' existed previously, but was a
 variable, not a user option.)
 
-+++
 *** 'compare-windows' now compares text with the most recently selected window
 instead of the next window.  If you want the previous behavior of
 comparing with the next window, customize the new option
 'compare-windows-get-window-function' to the value
 'compare-windows-get-next-window'.
 
----
 *** Two new faces 'compare-windows-removed' and 'compare-windows-added'
 replace the face 'compare-windows', which is now an obsolete alias for
 'compare-windows-added'.
 
----
 *** The VC state indicator in the mode line now has different faces
 corresponding to each of the possible states.  See the 'vc-faces'
 customization group.
 
----
 *** 'log-edit-insert-changelog' converts "(tiny change)" to
 "Copyright-paperwork-exempt: yes".  Set 'log-edit-rewrite-tiny-change'
 nil to disable this.
 
-+++
 *** vc-mcvs.el has been removed.
 
----
 ** VHDL mode now supports VHDL'08.
 
 ** Calculator
 
----
 *** Decimal display mode uses "," groups, so it's more
 fitting for use in money calculations
 
----
 *** Factorial works with non-integer inputs.
 
 ** Hide-IfDef mode
 
----
 *** Hide-IfDef mode now support full C/C++ expressions in macros,
 macro argument expansion, interactive macro evaluation and automatic
 scanning of #define'd symbols.
 
----
 *** New command 'hif-evaluate-macro', bound to 'C-c @ e', displays the
 result of evaluating a macro.
 
----
 *** New command 'hif-clear-all-ifdef-define', bound to 'C-c @ C', clears
 all defined symbols in 'hide-ifdef-env'.
 
----
 *** New custom variable 'hide-ifdef-header-regexp' to define C/C++ header
 file name patterns.  Defaults to files whose extension is one of '.h',
 '.hh', '.hpp', '.hxx', or '.h++', matched case-insensitively.
 
----
 *** New custom variable 'hide-ifdef-expand-reinclusion-protection' to prevent
 reinclusion protected (a.k.a. "idempotent") header files from being hidden.
 (This could happen when an idempotent header file is visited again,
 when its guard symbol is already defined.)  Defaults to t.
 
----
 *** New custom variable 'hide-ifdef-exclude-define-regexp' to define symbol
 name patterns (e.g. all "FOR_DOXYGEN_ONLY_*") to be ignored when
 looking for macro definitions.  By default, no symbols are ignored.
 
 ** TeX mode
 
-+++
 *** New custom variable 'tex-print-file-extension' to help users who
 use PDF instead of DVI.
 
-+++
 *** TeX mode now supports Prettify Symbols mode.  When enabling
 'prettify-symbols-mode' in a tex-mode buffer, \alpha ... \omega, and
 many other math macros are displayed using unicode characters.
 
-+++
 ** New 'big-indent' style in 'whitespace-mode' highlights deep indentation.
 By default, 32 consecutive spaces or four consecutive TABs are
 considered to be too deep, but the new variable
 'whitespace-big-indent-regexp' can be customized to change that.
 
----
 ** New options in 'tildify-mode'.
 New options 'tildify-space-string', 'tildify-pattern', and
 'tildify-foreach-region-function' variables make
@@ -1665,7 +1471,6 @@ New options 'tildify-space-string', 'tildify-pattern', and
 'tildify-ignored-environments-alist' variables (as well as a few
 helper functions) obsolete.
 
-+++
 ** New package Xref replaces Etags's front-end and UI.
 
 The new package Xref provides a generic framework and new commands to
@@ -1693,11 +1498,9 @@ As a result of this, the following commands are now obsolete:
 'tags-search' and 'tags-query-replace', for which there are no direct
 replacements yet.
 
-+++
 *** Variants of 'tags-search' and 'tags-query-replace' in Dired were also
 replaced by xref-style commands, see the "Dired" section below.
 
-+++
 *** New variables
 
 'find-tag-marker-ring-length' is now an obsolete alias for
@@ -1706,7 +1509,6 @@ alias for a private variable.  'xref-push-marker-stack' and
 'xref-pop-marker-stack' should be used instead to manipulate the stack
 of searches for definitions.
 
----
 *** 'xref-find-definitions' and 'describe-function' now display
 information about mode local overrides (defined by cedet/mode-local.el
 'define-overloadable-function' 'define-mode-local-overrides').
@@ -1714,7 +1516,6 @@ information about mode local overrides (defined by cedet/mode-local.el
 The framework's Lisp API is still experimental and can change in major,
 backward-incompatible ways.
 
----
 ** New package Project
 
 The new package Project provides generic infrastructure for dealing
@@ -1726,69 +1527,54 @@ The Lisp API of this package is still experimental.
 ** EUDC
 EUDC's LDAP backend has been improved.
 
-+++
 *** EUDC supports LDAP-over-SSL URLs (ldaps://).
 
----
 *** EUDC passes LDAP passwords through a pipe to the ldapsearch
 subprocess instead of on the command line.
 
----
 *** EUDC handles LDAP wildcards automatically so the user shouldn't
 need to configure this manually anymore.
 
-+++
 *** The LDAP configuration section of EUDC's manual has been
 rewritten.
 
 There have also been customization changes.
 
-+++
 *** New custom variable 'eudc-server-hotlist' to allow specifying
 multiple EUDC servers in init file.
 
-+++
 *** Custom variable 'eudc-inline-query-format' defaults to completing
 on email and firstname instead of surname.
 
----
 *** Custom variable 'eudc-expansion-overwrites-query' defaults to nil
 to avoid interfering with the kill ring.
 
-+++
 *** Custom variable 'eudc-inline-expansion-format' defaults to
 "Firstname Surname <mail-address>".
 
-+++
 *** Custom variable 'eudc-options-file' defaults to
 "~/.emacs.d/eudc-options".
 
----
 *** New custom variable 'ldap-ldapsearch-password-prompt-regexp' to
 allow overriding the regular expression that recognizes the ldapsearch
 command line's password prompt.
 
----
-EUDC's BBDB backend now supports BBDB 3.
+*** EUDC's BBDB backend now supports BBDB 3.
 
----
-EUDC's PH backend (eudcb-ph.el) is obsolete.
+*** EUDC's PH backend (eudcb-ph.el) is obsolete.
 
 ** Eshell
 
-+++
 *** The new built-in command 'clear' can scroll window contents out of sight.
 If provided with an optional non-nil argument, the scrollback contents
 will be cleared.
 
-+++
 *** New buffer syntax '#<buffer-name>', which is equivalent to
 '#<buffer buffer-name>'.  This shorthand makes interacting with
 buffers from eshell more convenient.  Custom variable
 'eshell-buffer-shorthand', which has been broken for a while, has been
 removed.
 
-+++
 *** By default, eshell "visual" program buffers (created by
 'eshell-visual-commands' and similar custom vars) are no longer killed
 when their processes die.  This fixes issues with short-lived commands
@@ -1799,55 +1585,43 @@ make the new option 'eshell-destroy-buffer-when-process-dies' non-nil.
 
 ** Browse-url
 
----
 *** Support for the Google Chrome web browser.
 
----
 *** Support for the Conkeror web browser.
 
----
 *** Support for several ancient browsers is now officially obsolete.
 
-+++
 ** 'tar-mode': new 'tar-new-entry' command, allowing for new members to
 be added to the archive.
 
 ** Autorevert
 
----
 *** Dired buffers are also auto-reverted via file notifications, if
 Emacs is compiled with file notification support.
 
----
 *** 'auto-revert-use-notify' is set to nil in 'global-auto-revert-mode'.
 See <http://debbugs.gnu.org/22814>.
 
 ** File Notifications
 
-+++
 *** The kqueue library is integrated for *BSD and Mac OS X machines.
 
-+++
 *** The new event 'stopped' signals, that a file notification watch is
 not active any longer.
 
-+++
 *** The new function 'file-notify-valid-p' checks, whether a file
 notification descriptor still corresponds to an activate watch.
 
 ** Dired
 
-+++
 *** The command 'dired-do-compress', bound to 'Z', now can compress
 directories and decompress zip files.
 
-+++
 *** New command 'dired-do-compress-to', bound to 'c', can be used to
 compress many marked files into a single named archive.  The
 compression command is determined from the new
 'dired-compress-files-alist' variable.
 
-+++
 *** New user interface for the 'A' and 'Q' commands.
 These keys, now bound to 'dired-do-find-regexp' and
 'dired-do-find-regexp-and-replace', work similarly to 'xref-find-apropos'
@@ -1861,28 +1635,23 @@ back.  We intend to obsolete the old commands in a future release.
 
 ** Tabulated List Mode
 
-+++
 *** It is now safe for a mode that derives 'tabulated-list-mode' to not
 call 'tabulated-list-init-header', in which case it will have no
 header.
 
-+++
 *** 'tabulated-list-print' takes a second optional argument, UPDATE,
 which specifies an alternative printing method which is faster when
 few or no entries have changed.
 
 ** Obsolete packages
 
----
 *** gulp.el
 
----
 *** landmark.el (moved to elpa.gnu.org)
 
 
 * New Modes and Packages in Emacs 25.1
 
----
 ** pinentry.el allows GnuPG passphrase to be prompted through the
 minibuffer instead of a graphical dialog, depending on whether the gpg
 command is called from Emacs (i.e., INSIDE_EMACS environment variable
@@ -1891,60 +1660,49 @@ later) and Pinentry (0.9.5 or later).  To use this feature, add
 "allow-emacs-pinentry" to "~/.gnupg/gpg-agent.conf" and reload the
 configuration with "gpgconf --reload gpg-agent".
 
-+++
 ** cl-generic.el provides CLOS-style multiple-dispatch generic functions.
 The main entry points are 'cl-defgeneric' and 'cl-defmethod'.  See the
 node "Generic Functions" in the Emacs Lisp manual for more details.
 
----
 ** 'scss-mode' (a minor variant of 'css-mode') is a major mode for editing
 SCSS (Sassy CSS) files.
 
----
 ** 'let-alist' is a new macro (and a package) that allows one to easily
 let-bind the values stored in an alist.
 
----
 ** 'tildify-mode' allows automatic insertion of hard spaces as one
 types the text.  Breaking line after a single-character words is
 forbidden by Czech and Polish typography (and may be discouraged in
 other languages), so 'auto-tildify-mode' makes it easier to create
 a typographically-correct documents.
 
----
 ** The 'seq' library adds sequence manipulation functions and macros
 that complement basic functions provided by subr.el.  All functions
 are prefixed with 'seq-' and work on lists, strings and vectors.
 'pcase' accepts a new Upattern 'seq'.
 
----
 ** The 'map' library provides map-manipulation functions that work on
 alists, hash-table and arrays.  All functions are prefixed with
 'map-'.  'pcase' accepts a new UPattern 'map'.
 
----
 ** The 'thunk' library provides functions and macros to control the
 evaluation of forms.
 
----
 ** 'js-jsx-mode' (a minor variant of 'js-mode') provides indentation
 support for JSX, an XML-like syntax extension to ECMAScript.
 
 
 * Incompatible Lisp Changes in Emacs 25.1
 
----
 ** 'setq' and 'setf' must now be called with an even number of
 arguments.  The earlier behavior of silently supplying a nil to the
 last variable when there was an odd number of arguments has been
 eliminated.
 
-+++
 ** 'syntax-begin-function' is declared obsolete.
 Removed 'font-lock-beginning-of-syntax-function' and the SYNTAX-BEGIN
 slot in 'font-lock-defaults'.
 
-+++
 ** The new implementation of Subword mode affects word movement everywhere.
 When Subword mode is turned on, 'forward-word', 'backward-word', and
 everything that uses them will move by sub-words, effectively
@@ -1952,19 +1710,16 @@ overriding the buffer's syntax table.  Lisp programs that shouldn't be
 affected by Subword mode should call the new functions
 'forward-word-strictly' and 'backward-word-strictly' instead.
 
-+++
 ** 'package-initialize' now sets 'package-enable-at-startup' to nil if
 called during startup.  Users who call this function in their init
 file and still expect it to be run after startup should set
 'package-enable-at-startup' to t after the call to
 'package-initialize'.
 
----
 ** ':global' minor mode use 'setq-default' rather than 'setq'.
 This means that you can't use 'make-local-variable' and expect them to
 "magically" become buffer-local.
 
-+++
 ** 'track-mouse' no longer freezes the shape of the mouse pointer.
 The 'track-mouse' form no longer refrains from changing the shape of
 the mouse pointer for the entire time the body of that form is
@@ -1973,75 +1728,59 @@ large portions of the Emacs display, and want to avoid changes in the
 pointer shape during dragging, should bind the variable 'track-mouse'
 to the special value 'dragging' in the body of the form.
 
----
 ** The optional PREDICATE argument of 'lisp-complete-symbol' no longer
 has any effect.  (This change was made in Emacs 24.4 but was not
 advertised at the time.)
 
-+++
 ** 'indirect-function' does not signal 'void-function' any more.
 This is mostly a bug-fix, since this change was missed back in 24.4 when
 'symbol-function' was changed not to signal 'void-function' any more.
 
-+++
 *** As a consequence, the second arg of 'indirect-function' is now obsolete.
 
-+++
 ** 'M-x shell' and 'M-x compile' no longer set the EMACS environment variable.
 This avoids clashing when other programs use the variable for other purposes.
 Although 'M-x term' still sets EMACS for compatibility with Bash 4.3
 and earlier, this is deprecated and will be phased out when Bash 4.4
 or later takes over.  Use the INSIDE_EMACS environment variable instead.
 
-+++
 ** 'save-excursion' does not save&restore the mark any more.
 Use 'save-mark-and-excursion' if you want the old behavior.
 
-+++
 ** 'read-buffer' and 'read-buffer-function' can now be called with a 4th
 argument (PREDICATE).
 
-+++
 ** 'completion-table-dynamic' by default stays in the minibuffer.
 The minibuffer will be the current buffer when the function is called.
 If you want the old behavior of calling the function in the buffer
 from which the minibuffer was entered, use the new argument
 SWITCH-BUFFER to 'completion-table-dynamic'.
 
----
 ** window-configurations no longer record the buffers' marks.
 
----
 ** 'inhibit-modification-hooks' now also inhibits lock-file checks, as
 well as active region handling.
 
-+++
 ** 'deactivate-mark' is now buffer-local.
 
-+++
 ** 'cl-the' now asserts that its argument is of the given type.
 
-+++
 ** 'process-running-child-p' may now return a numeric process
 group ID instead of t.
 
-+++
 ** Mouse click events on mode line or header line no longer include
 any reference to a buffer position.  The 6th member of the mouse
 position list returned for such events is now nil.
 
----
 ** Menu items in keymaps do not support the "key shortcut cache" any more.
 These slots used to hold key-shortcut data, but have been obsolete since
 Emacs 21.
 
----
 ** Emacs no longer downcases the first letter of a system diagnostic
 when signaling a file error.  For example, it now reports "Permission
 denied" instead of "permission denied".  The old behavior was problematic
 in languages like German where downcasing rules depend on grammar.
 
-+++
 ** New variable 'text-quoting-style' to control how Emacs translates quotes.
 Set it to 'curve' for curved single quotes, to 'straight' for straight
 apostrophes, and to 'grave' for grave accent and apostrophe.  The
@@ -2050,7 +1789,6 @@ displayable, and like 'grave' otherwise.  The new variable affects
 display of diagnostics and help, but not of info.  As the variable is
 not intended for casual use, it is not a user option.
 
-+++
 ** Message-issuing functions like 'message' and 'error' now translate
 various sorts of single quotes in their format strings according to
 the value of 'text-quoting-style' (see above).  This translation
@@ -2058,20 +1796,17 @@ cannot be disabled.  To get the old behavior, use 'format', which is
 not affected by 'text-quoting-style', e.g., (message "%s" (format
 "...." foo bar)).
 
-+++
 ** 'substitute-command-keys' now replaces quotes.
 That is, it converts documentation strings' quoting style as per the
 value of 'text-quoting-style'.  Doc strings in source code can use
 either curved single quotes or grave accents and apostrophes.  As
 before, characters preceded by \= are output as-is.
 
-+++
 ** The character classes [:alpha:] and [:alnum:] in regular expressions
 now match multibyte characters using Unicode character properties.
 If you want the old behavior where they matched any character with
 word syntax, use '\sw' instead.
 
-+++
 ** The character classes [:graph:] and [:print:] in regular expressions
 no longer match every multibyte character.  Instead, Emacs now
 consults the Unicode character properties to determine which
@@ -2079,23 +1814,19 @@ characters are graphic or printable.  In particular, surrogates and
 unassigned codepoints are now rejected.  If you want the old behavior,
 use [:multibyte:] instead.
 
-+++
 ** The 'diff' command uses the unified format now.  To restore the old
 behavior, set 'diff-switches' to '-c'.
 
----
 ** 'grep-template' and 'grep-find-template' values don't include the
 --color argument anymore.  It's added at the <C> place holder position
 dynamically.  Any third-party code that changes these templates should
 be updated accordingly.
 
-+++
 ** '(/ N)' is now equivalent to '(/ 1 N)' rather than to '(/ N 1)'.
 The new behavior is compatible with Common Lisp and with XEmacs.
 This change does not affect Lisp code intended to be portable to
 Emacs 24.2 and earlier, which did not support unary '/'.
 
-+++
 ** The 'default-directory' value doesn't have to end slash.  To make
 that happen, 'unhandled-file-name-directory' now defaults to calling
 'file-name-as-directory'.
@@ -2104,62 +1835,48 @@ that happen, 'unhandled-file-name-directory' now defaults to calling
 * Lisp Changes in Emacs 25.1
 
 ** 'pcase'
-+++
 *** New UPatterns 'quote', 'app'.
-+++
 *** New UPatterns can be defined with 'pcase-defmacro'.
-+++
 *** New vector QPattern.
 
----
 ** 'syntax-propertize' is now automatically called on-demand during forward
 parsing functions like 'forward-sexp'.
 
-+++
 ** New hooks 'prefix-command-echo-keystrokes-functions' and
 'prefix-command-preserve-state-hook' allow the definition of prefix
 commands other than the predefined 'C-u'.
 
-+++
 ** New functions 'filepos-to-bufferpos' and 'bufferpos-to-filepos'.
 These allow conversion between buffer positions and the corresponding
 file byte offsets, given the file's encoding.
 
-+++
 ** The default value of 'load-read-function' is now 'read'.
 Previously, the default value of nil implied using 'read'.
 
-+++
 ** New hook 'pre-redisplay-functions'.
 It is a bit easier to use than 'pre-redisplay-function'.
 
-+++
 ** The second arg of 'looking-back' should always be provided explicitly.
 Previously, it was an optional argument, now it's mandatory.
 
-+++
 ** Text properties 'intangible', 'point-entered', and 'point-left' are obsolete.
 Replaced by properties 'cursor-intangible' and 'cursor-sensor-functions',
 implemented by the new 'cursor-intangible-mode' and
 'cursor-sensor-mode' minor modes.
 
-+++
 ** 'inhibit-point-motion-hooks' now defaults to t and is obsolete.
 Use the new minor modes 'cursor-intangible-mode' and
 'cursor-sensor-mode' instead.
 
-+++
 ** New process type 'pipe', which can be used in combination with the
 ':stderr' keyword of 'make-process' to handle standard error output
 of subprocess.
 
-+++
 ** New function 'make-process' provides an alternative interface to
 'start-process'.  It allows programs to set process parameters such as
 process filter, sentinel, etc., through keyword arguments (similar to
 'make-network-process').
 
-+++
 ** Subprocesses are automatically told about changes in window dimensions.
 The new option 'window-adjust-process-window-size-function' controls
 how subprocesses are told to adapt their logical window sizes to
@@ -2167,48 +1884,37 @@ changes in the Emacs window configuration.  Its default value calls
 'set-process-window-size' with the smallest dimensions of all the
 windows that display the subprocess's buffer.
 
-+++
 ** A new function 'directory-files-recursively' returns all matching
 files (recursively) under a directory.
 
-+++
 ** New variable 'inhibit-message', when bound to non-nil, inhibits
 'message' and related functions from displaying messages in the echo
 area.  The output is still logged to the '*Messages*' buffer.
 
-+++
 ** A new text property 'inhibit-read-only' can be used in read-only
 buffers to allow certain parts of the text to be writable.
 
-+++
 ** A new variable 'comment-end-can-be-escaped' is useful in languages
 such as C and C++ where line comments with escaped newlines are
 continued to the next line.
 
-+++
 ** New macro 'define-advice'.
 
-+++
 ** Emacs Lisp now supports generators.
 See the "Generators" section of the ELisp manual for the details.
 
-+++
 ** New finalizer facility for running code when objects become unreachable.
 See the "Finalizer Type" subsection in the ELisp manual for the
 details.
 
----
 ** Lexical closures can use '(:documentation FORM)' to build their docstring.
 It should be placed right where the docstring would be, and FORM is then
 evaluated (and should return a string) when the closure is built.
 
-+++
 ** 'define-inline' provides a new way to define inlinable functions.
 
-+++
 ** New function 'macroexpand-1' to perform a single step of macro expansion.
 
-+++
 ** Some "x-*" functions were obsoleted and/or renamed:
 *** 'x-select-text' is renamed 'gui-select-text'.
 *** 'x-selection-value' is renamed 'gui-selection-value'.
@@ -2217,18 +1923,15 @@ evaluated (and should return a string) when the closure is built.
 *** 'x-get-selection-value' is renamed to 'gui-get-primary-selection'.
 *** 'x-set-selection' is renamed to 'gui-set-selection'.
 
-+++
 ** New function 'string-greaterp', which return the opposite result of
 'string-lessp'.
 
-+++
 ** The new functions 'string-collate-lessp' and 'string-collate-equalp'
 preserve the collation order as defined by the system's locale(1)
 environment.  For the time being this is implemented for modern POSIX
 systems and for MS-Windows, for other systems they fall back to their
 counterparts 'string-lessp' and 'string-equal'.
 
----
 *** The ls-lisp package uses 'string-collate-lessp' to sort file names.
 The effect is that, on systems that use ls-lisp for Dired, the default
 sort order of the files in Dired is now different from what it was in
@@ -2239,7 +1942,6 @@ longer appear near the beginning of the directory listing.  If you
 want the old, locale-independent sorting, customize the new option
 'ls-lisp-use-string-collate' to the nil value.
 
-+++
 *** The MS-Windows specific variable 'w32-collate-ignore-punctuation',
 if set to a non-nil value, causes the above 2 functions to ignore
 symbol and punctuation characters when collating strings.  This
@@ -2247,50 +1949,40 @@ emulates the behavior of modern Posix platforms when the locale's
 codeset is "UTF-8" (as in "en_US.UTF-8").  This is needed because
 MS-Windows doesn't support UTF-8 as codeset in its locales.
 
-+++
 ** New function 'alist-get', which is a generalized variable
 suitable for use with 'setf'.
 
-+++
 ** New function 'funcall-interactively', which works like 'funcall'
 but makes 'called-interactively-p' treat the function as (you guessed it)
 called interactively.
 
-+++
 ** New function 'function-put' to use instead of 'put' for function properties.
 
-+++
 ** The new function 'bidi-find-overridden-directionality' allows you to
 find characters whose directionality was, perhaps maliciously,
 overridden by directional override control characters.  Lisp programs
 can use this to detect potential phishing of URLs and other links that
 exploits bidirectional display reordering.
 
-+++
 ** The new function 'buffer-substring-with-bidi-context' allows you to
 copy a portion of a buffer into a different location while preserving
 the visual appearance both of the copied text and the text at
 destination, even when the copied text includes mixed bidirectional
 text and directional control characters.
 
-+++
 ** New properties that can be specified with 'declare':
 *** '(interactive-only INSTEAD)', says to use INSTEAD for non-interactive use.
 *** '(pure VAL)', if VAL is non-nil, indicates the function is pure.
 *** '(side-effect-free VAL)', if VAL is non-nil, indicates the function does not
 have side effects.
 
-+++
 ** New macro 'with-file-modes', for evaluating expressions with default file
 permissions set to temporary values (e.g., for creating private files).
 
-+++
 ** You can access the slots of structures using 'cl-struct-slot-value'.
 
-+++
 ** Function 'sort' can deal with vectors.
 
----
 ** Function 'system-name' now returns an updated value if the current
 system's name has changed or if the Emacs process has changed systems.
 To avoid long waits it no longer consults DNS to canonicalize the name
@@ -2298,35 +1990,28 @@ To avoid long waits it no longer consults DNS to canonicalize the name
 'message-user-fqdn' if this bothers you). The variable 'system-name'
 is now obsolete.
 
-+++
 ** Function 'write-region' no longer outputs "Wrote FILE" in batch mode.
 
----
 ** If 'pwd' is called with a prefix argument, insert the current default
 directory at point.
 
-+++
 ** New functions return extended information about fonts and faces.
 
-+++
 *** The function 'font-info' now returns more details about a font.
 In particular, it now returns the average width of the font's
 characters, which can be used for geometry-related calculations.
 
-+++
 *** A new function 'default-font-width' returns the average width of a
 character in the current buffer's default font.  If the default face
 is remapped (see 'face-remapping-alist'), the value for the remapped
 face is returned.  This function complements the existing function
 'default-font-height'.
 
-+++
 *** New functions 'window-font-height' and 'window-font-width' return
 the height and average width of characters in a specified face and
 window.  If FACE is remapped (see 'face-remapping-alist'), the
 function returns the information for the remapped face.
 
-+++
 *** A new function 'window-max-chars-per-line' returns the maximal
 number of characters that can be displayed on one line.  If a face
 and/or window are provided, these values are used for the
@@ -2334,7 +2019,6 @@ calculation.  This function is different from 'window-body-width' in
 that it accounts for (i) continuation glyphs, (ii) the size of the
 font, and (iii) the specified window.
 
----
 ** New utilities in subr-x.el:
 
 *** New macros 'if-let' and 'when-let' allow defining bindings and to
@@ -2343,7 +2027,6 @@ execute code depending whether all values are true.
 *** New macros 'thread-first' and 'thread-last' allow threading a form
 as the first or last argument of subsequent forms.
 
-+++
 ** Documentation strings now support quoting with curved single quotes
 in addition to the old style with grave accent and apostrophe.  The
 new style looks better on today's displays.  In the new Electric Quote
@@ -2354,18 +2037,15 @@ works) by typing 'A-[' and 'A-]'.  As described above under
 'text-quoting-style', the user can specify how to display doc string
 quotes.
 
-+++
 ** New function 'format-message' is like 'format' and also converts
 curved single quotes, grave accents and apostrophes as per
 'text-quoting-style'.
 
-+++
 ** 'show-help-function's arg is converted via 'substitute-command-keys'
 before being passed to the function.  Help strings, help-echo
 properties, etc. can therefore contain command key escapes and
 quotation marks.
 
-+++
 ** Time-related changes:
 
 *** Time conversion functions now accept an optional ZONE argument
@@ -2398,45 +2078,37 @@ been obsoleted.
 undocumented integer-pair format.  Instead, they return a list of two
 integers.
 
-+++
 ** New function 'set-binary-mode' allows switching a standard stream
 of the Emacs process to binary I/O mode.
 
-+++
 ** The new function 'directory-name-p' can be used to check whether a file
 name (as returned from, for instance, 'file-name-all-completions') is
 a directory file name.  It returns non-nil if the last character in
 the name is a directory separator character (forward slash on GNU and
 Unix systems, forward- or backslash on MS-Windows and MS-DOS).
 
----
 ** ASCII approximations to curved quotes are put in 'standard-display-table'
 if the terminal cannot display curved quotes.
 
-+++
 ** Standard output and error streams now transliterate characters via
 'standard-display-table', and encode output using 'locale-coding-system'.
 To force a specific encoding, bind 'coding-system-for-write' to the
 coding-system of your choice when invoking functions like 'prin1' and
 'message'.
 
-+++
 ** New var 'truncate-string-ellipsis' to choose how to indicate truncation.
 
-+++
 ** New possible value for 'system-type': 'nacl'.
 This is used by Google's Native Client (NaCl).
 
 ** Miscellaneous name change
 
----
 For consistency with the usual Emacs spelling, the Lisp variable
 'hfy-optimisations' has been renamed to 'hfy-optimizations'.
 The old name should still work, as an obsolescent alias.
 
 ** Changes in Frame- and Window- Handling
 
-+++
 *** Emacs can now draw horizontal scroll bars on some platforms that
 provide toolkit scroll bars, namely Gtk+, Lucid, Motif and Windows.
 Horizontal scroll bars are turned off by default.
@@ -2476,30 +2148,24 @@ bars too.
 **** New buffer-local variables 'horizontal-scroll-bar' and
 'scroll-bar-height'.
 
-+++
 *** New functions 'frame-geometry' and 'frame-edges' give access to a
 frame's geometry.
 
-+++
 *** New functions 'mouse-absolute-pixel-position' and
 'set-mouse-absolute-pixel-position' get/set screen coordinates of the
 mouse cursor.
 
-+++
 *** The function 'window-edges' now accepts three additional arguments to
 retrieve body, absolute and pixel edges of the window.
 
-+++
 *** The functions 'window-inside-edges', 'window-inside-pixel-edges' and
 'window-inside-absolute-pixel-edges' have been renamed to respectively
 'window-body-edges', 'window-body-pixel-edges' and
 'window-absolute-body-pixel-edges'.  The old names are kept as aliases.
 
-+++
 *** New function 'window-absolute-pixel-position' to get the screen
 coordinates of a visible buffer position.
 
-+++
 *** The height of a frame's menu and tool bar are no longer counted in the
 frame's text height.  This means that the text height stands only for
 the height of the frame's root window plus that of the echo area (if
@@ -2507,7 +2173,6 @@ present).  This was already the behavior for frames with external tool
 and menu bars (like in the Gtk builds) but has now been extended to all
 builds.
 
-+++
 *** Frames now do not necessarily preserve the number of columns or lines
 they display when setting default font, menu bar, fringe width, or
 scroll bars.  In particular, maximized and fullscreen frames are
@@ -2519,23 +2184,19 @@ setting default font, menu bar, fringe width, or scroll bars of a
 specific frame does not resize that frame in order to preserve the
 number of columns or lines it displays.
 
-+++
 *** New function 'window-preserve-size' allows you to preserve the size of
 a window without "fixing" it.  It's supported by 'fit-window-to-buffer',
 'temp-buffer-resize-mode' and 'display-buffer'.
 
-+++
 *** New 'display-buffer' action function 'display-buffer-use-some-frame'.
 This displays the buffer in an existing frame other than the current
 frame, and allows the caller to specify a frame predicate to exclude
 frames.
 
-+++
 *** New minor mode 'window-divider-mode' and options
 'window-divider-default-places', 'window-divider-default-bottom-width'
 and 'window-divider-default-right-width'.
 
-+++
 *** The window displaying the '*Completions*' buffer with minibuffer
 completion candidates is now shown at the bottom of the selected
 frame.  The size of that window is always as large as required to
@@ -2545,13 +2206,11 @@ to provide space for the '*Completions*' display.  The Emacs manual
 describes how to customize 'display-buffer-alist' to get back the old
 behavior, see the node "Temporary Displays" there.
 
----
 ** Tearoff menus and detachable toolbars for Gtk+ have been removed.
 Those features have been deprecated in Gtk+ for a long time.
 
 ** Etags
 
-+++
 *** etags no longer qualifies class members by default.
 
 By default, 'etags' will not qualify class members for Perl and C-like
@@ -2567,17 +2226,14 @@ that using -Q might make some class members become "unknown" to 'M-.'
 ('xref-find-definitions'); if so, you can use 'C-u M-.' to specify the
 qualified names by hand.
 
-+++
 *** New language Ruby
 
 Names of modules, classes, methods, functions, and constants are
 tagged.  Overloaded operators are also tagged.
 
-+++
 *** New language Go
 Names of packages, functions, and types are tagged.
 
-+++
 *** Improved support for Lua
 
 Etags now tags functions even if the "function" keyword follows some
@@ -2586,36 +2242,28 @@ whitespace at line beginning.
 
 * Changes in Emacs 25.1 on Non-Free Operating Systems
 
----
 ** MS-Windows specific Emacs build scripts are no longer in the distribution.
 This includes the makefile.w32-in files in various subdirectories, and
 the support files.  The file nt/configure.bat now just tells the user
 to use the procedure described in nt/INSTALL, by running the Posix
 'configure' script in the top-level directory.
 
----
 ** Building Emacs for MS-Windows requires at least Windows XP
 or Windows Server 2003.  The built binaries still run on all versions
 of Windows starting with Windows 9X.
 
-+++
 ** Emacs running on MS-Windows now supports the daemon mode.
 
----
 ** The byte counts in etags-generated TAGS files are now the same on
 MS-Windows as they are on other platforms.
 
----
 ** On OS X, configure creates a Cocoa ("Nextstep") build by default.
 Pass '--without-ns' to configure to create an X11 build, the old default.
 
----
 ** OS X 10.5 or older is no longer supported.
 
----
 ** OS X on PowerPC is no longer supported.
 
----
 ** New variable 'ns-use-fullscreen-animation' controls animation for
 non-native NS fullscreen.  The default is nil.  Set to t to enable
 animation when entering and leaving fullscreen.  For native OSX fullscreen
@@ -2630,7 +2278,6 @@ If some symbols, such as emoji, do not display, we suggest to install
 an appropriate font, such as Symbola; then they will be displayed,
 albeit without the color effects.
 
----
 ** The new function 'w32-application-type' returns the type of an
 MS-Windows application given the name of its executable program file.
 
diff --git a/lisp/eshell/em-term.el b/lisp/eshell/em-term.el
index 3e5de0c0097..208629ce135 100644
--- a/lisp/eshell/em-term.el
+++ b/lisp/eshell/em-term.el
@@ -102,10 +102,11 @@ See also `eshell-visual-commands' and `eshell-visual-options'."
 of commands with options that present their output in a visual
 fashion.  For example, a sensible entry would be
 
-  (\"git\" \"--help\")
+  (\"git\" \"--help\" \"--paginate\")
 
 because \"git <command> --help\" shows the command's
-documentation with a pager.
+documentation with a pager and \"git --paginate <command>\"
+always uses a pager for output.
 
 See also `eshell-visual-commands' and `eshell-visual-subcommands'."
   :type '(repeat (cons (string :tag "Command")
diff --git a/lisp/profiler.el b/lisp/profiler.el
index 2aff99986a1..dac42fec0c7 100644
--- a/lisp/profiler.el
+++ b/lisp/profiler.el
@@ -693,7 +693,8 @@ With a prefix argument, expand the whole subtree."
 
 (defun profiler-report-toggle-entry (&optional arg)
   "Expand entry at point if the tree is collapsed,
-otherwise collapse."
+otherwise collapse.  With prefix argument, expand all subentries
+below entry at point."
   (interactive "P")
   (or (profiler-report-expand-entry arg)
       (profiler-report-collapse-entry)))
diff --git a/lisp/progmodes/gdb-mi.el b/lisp/progmodes/gdb-mi.el
index b2c06145187..4adcfe7ff16 100644
--- a/lisp/progmodes/gdb-mi.el
+++ b/lisp/progmodes/gdb-mi.el
@@ -673,14 +673,18 @@ NOARG must be t when this macro is used outside `gud-def'"
 
 ;;;###autoload
 (defun gdb (command-line)
-  "Run gdb on program FILE in buffer *gud-FILE*.
-The directory containing FILE becomes the initial working directory
-and source-file directory for your debugger.
-
-COMMAND-LINE is the shell command for starting the gdb session.
-It should be a string consisting of the name of the gdb
-executable followed by command line options.  The command line
-options should include \"-i=mi\" to use gdb's MI text interface.
+  "Run gdb passing it COMMAND-LINE as arguments.
+
+If COMMAND-LINE names a program FILE to debug, gdb will run in
+a buffer named *gud-FILE*, and the directory containing FILE
+becomes the initial working directory and source-file directory
+for your debugger.
+If COMMAND-LINE requests that gdb attaches to a process PID, gdb
+will run in *gud-PID*, otherwise it will run in *gud*; in these
+cases the initial working directory is the default-directory of
+the buffer in which this command was invoked.
+
+COMMAND-LINE should include \"-i=mi\" to use gdb's MI text interface.
 Note that the old \"--annotate\" option is no longer supported.
 
 If option `gdb-many-windows' is nil (the default value) then gdb just
diff --git a/lisp/progmodes/gud.el b/lisp/progmodes/gud.el
index ceb57b7156d..504ad546cfd 100644
--- a/lisp/progmodes/gud.el
+++ b/lisp/progmodes/gud.el
@@ -733,9 +733,15 @@ It should return a list of completion strings.")
 ;; The old gdb command (text command mode).  The new one is in gdb-mi.el.
 ;;;###autoload
 (defun gud-gdb (command-line)
-  "Run gdb on program FILE in buffer *gud-FILE*.
-The directory containing FILE becomes the initial working
-directory and source-file directory for your debugger."
+  "Run gdb passing it COMMAND-LINE as arguments.
+If COMMAND-LINE names a program FILE to debug, gdb will run in
+a buffer named *gud-FILE*, and the directory containing FILE
+becomes the initial working directory and source-file directory
+for your debugger.
+If COMMAND-LINE requests that gdb attaches to a process PID, gdb
+will run in *gud-PID*, otherwise it will run in *gud*; in these
+cases the initial working directory is the default-directory of
+the buffer in which this command was invoked."
   (interactive (list (gud-query-cmdline 'gud-gdb)))
 
   (when (and gud-comint-buffer
diff --git a/src/data.c b/src/data.c
index 5af590abed9..9a076741f78 100644
--- a/src/data.c
+++ b/src/data.c
@@ -630,8 +630,8 @@ global value outside of any lexical scope.  */)
 }
 
 /* FIXME: It has been previously suggested to make this function an
-   alias for symbol-function, but upon discussion at Debbug#23957,
-   there is a risk breaking backward compatiblity, as some users of
+   alias for symbol-function, but upon discussion at Bug#23957,
+   there is a risk breaking backward compatibility, as some users of
    fboundp may expect `t' in particular, rather than any true
    value.  An alias is still welcome so long as the compatibility
    issues are addressed.  */
diff --git a/src/keyboard.c b/src/keyboard.c
index ed4968486c3..f27ca0f86e0 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -11689,7 +11689,8 @@ suppressed only after special commands that leave
 
   DEFVAR_LISP ("minibuffer-message-timeout", Vminibuffer_message_timeout,
                doc: /* How long to display an echo-area message when the minibuffer is active.
-If the value is not a number, such messages don't time out.  */);
+If the value is a number, it should be specified in seconds.
+If the value is not a number, such messages never time out.  */);
   Vminibuffer_message_timeout = make_number (2);
 
   DEFVAR_LISP ("throw-on-input", Vthrow_on_input,
diff --git a/src/nsterm.h b/src/nsterm.h
index 862ff2ec646..3d8b1a16a32 100644
--- a/src/nsterm.h
+++ b/src/nsterm.h
@@ -380,9 +380,9 @@ char const * nstrace_fullscreen_type_name (int);
 #endif
 #ifdef NS_IMPL_GNUSTEP
   BOOL applicationDidFinishLaunchingCalled;
+#endif
 @public
   int nextappdefined;
-#endif
 }
 - (void)logNotification: (NSNotification *)notification;
 - (void)antialiasThresholdDidChange:(NSNotification *)notification;
diff --git a/src/nsterm.m b/src/nsterm.m
index 8da2ffe5b7f..dcc1e87280b 100644
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -3927,8 +3927,8 @@ ns_send_appdefined (int value)
 {
   NSTRACE_WHEN (NSTRACE_GROUP_EVENTS, "ns_send_appdefined(%d)", value);
 
-#ifdef NS_IMPL_GNUSTEP
   // GNUstep needs postEvent to happen on the main thread.
+  // Cocoa needs nextEventMatchingMask to happen on the main thread too.
   if (! [[NSThread currentThread] isMainThread])
     {
       EmacsApp *app = (EmacsApp *)NSApp;
@@ -3938,7 +3938,6 @@ ns_send_appdefined (int value)
                          waitUntilDone:YES];
       return;
     }
-#endif
 
   /* Only post this event if we haven't already posted one.  This will end
        the [NXApp run] main loop after having processed all events queued at
@@ -5551,12 +5550,10 @@ not_in_argv (NSString *arg)
   ns_send_appdefined (-2);
 }
 
-#ifdef NS_IMPL_GNUSTEP
 - (void)sendFromMainThread:(id)unused
 {
   ns_send_appdefined (nextappdefined);
 }
-#endif
 
 - (void)fd_handler:(id)unused
 /* --------------------------------------------------------------------------