Merge from origin/emacs-26

f53ce87 ; ChangeLog.3 update
eca2677 Fix description of 'display-buffer-in-previous-window' again ...
7be50cd Consistently use @minus{} for negative arguments

# Conflicts:
#	ChangeLog.3

10 files changed, 942 insertions, 34 deletions

diff --git a/ChangeLog.3 b/ChangeLog.3
index fbaf8138528..c04940257fa 100644
--- a/ChangeLog.3
+++ b/ChangeLog.3
@@ -1,3 +1,878 @@
+2019-06-15  Martin Rudalics  <rudalics@gmx.at>
+
+        Fix description of 'display-buffer-in-previous-window' again (Bug#36161)
+
+        * lisp/window.el (display-buffer-in-previous-window): Make
+        doc-string more explicit (Bug#36161).
+        * doc/lispref/windows.texi (Buffer Display Action Functions):
+        Make description of 'display-buffer-in-previous-window' more
+        explicit.
+        (Buffer Display Action Alists): Mention
+        'display-buffer-in-previous-window' in description of
+        'reusable-frames' entry.
+
+2019-06-15  Eli Zaretskii  <eliz@gnu.org>
+
+        Consistently use @minus{} for negative arguments
+
+        * doc/emacs/mark.texi (Marking Objects):
+        * doc/misc/gnus.texi (Selecting a Group):
+        * doc/emacs/programs.texi (Comment Commands):
+        * doc/emacs/killing.texi (Deletion):
+        * doc/emacs/display.texi (Recentering):
+        * doc/lispref/display.texi (Face Attributes):
+        * doc/lispref/searching.texi (String Search, Regexp Search):
+        Make the markup of "-N" use @minus{} uniformly.  (Bug#35885)
+
+2019-06-15  Martin Rudalics  <rudalics@gmx.at>
+
+        Fix doc of 'display-buffer-in-previous-window' (Bug#36161)
+
+        * doc/lispref/windows.texi (Buffer Display Action Functions):
+        * lisp/window.el (display-buffer-in-previous-window): Tell
+        that 'display-buffer-in-previous-window' prefers
+        non-selected windows (Bug#36161).
+
+2019-06-15  Juanma Barranquero  <lekktu@gmail.com>
+
+        lisp/*.el: Minor docstring fixes
+
+        * lisp/subr.el (definition-prefixes): Reflow docstring.
+
+        * lisp/svg.el (svg-create): Doc fix to allow arg higlighting.
+        (svg-gradient, svg-rectangle): Improve docstring formatting.
+
+2019-06-15  Eli Zaretskii  <eliz@gnu.org>
+
+        Avoid assertion violation when comparing with main-thread
+
+        * src/thread.c (unmark_main_thread): New function.
+        * src/lisp.h (unmark_main_thread): Prototype it.
+        * src/alloc.c (garbage_collect_1): Call it after sweeping.
+        (Bug#33073)
+
+        * test/src/thread-tests.el (threads-test-bug33073): New test.
+
+2019-06-15  Andreas Schwab  <schwab@linux-m68k.org>
+
+        Revert "Don't mark main_thread (Bug#36155)"
+
+        This reverts commit 1877b7b4d79b3434379fd5a4abd85906c25df00c.
+
+2019-06-15  Andreas Schwab  <schwab@linux-m68k.org>
+
+        Don't mark main_thread (Bug#36155)
+
+        * src/thread.c (mark_threads_callback): Don't mark main_thread.
+
+2019-06-15  Eli Zaretskii  <eliz@gnu.org>
+
+        More quotation fixes (Bug#35885)
+
+        * doc/emacs/text.texi (Quotation Marks): Fix a typo.
+        * doc/emacs/modes.texi (Minor Modes): Fix another case of
+        showing quotations.
+
+2019-06-15  Eli Zaretskii  <eliz@gnu.org>
+
+        Minor copyedits in efaq-w32
+
+        * doc/misc/efaq-w32.texi (Grep, Recursive grep): More accurate
+        description of using 'findstr' as a poor-man's replacement for
+        'grep'.  Reported by 范凯 <m_pupil@163.com>
+
+2019-06-15  Eli Zaretskii  <eliz@gnu.org>
+
+        Tiny improvement of documentation of major mode conventions
+
+        * doc/lispref/modes.texi (Major Mode Conventions): More
+        accurate advice regarding customization of 'C-M-a' by major
+        modes.
+
+2019-06-15  Juanma Barranquero  <lekktu@gmail.com>
+
+        * nt/addpm.c (main): Fix buffer overflow
+
+2019-06-15  Eli Zaretskii  <eliz@gnu.org>
+
+        Resurrect display-line-number-mode in client frames
+
+        * lisp/linum.el (linum-on): Mention bug#35726 in a comment.
+        * lisp/display-line-numbers.el
+        (display-line-numbers--turn-on): Don't check for daemon.
+        (Bug#35726)
+
+2019-06-15  Eli Zaretskii  <eliz@gnu.org>
+
+        * src/fns.c (Fmapconcat): Doc fix.  (Bug#35710)
+
+2019-06-15  Phillip Lord  <phillip.lord@russet.org.uk>
+
+        Fix typo
+
+        * nt/README.W32:
+
+2019-06-15  Eli Zaretskii  <eliz@gnu.org>
+
+        * lisp/term/w32-win.el ([noname]): Bind to 'ignore'.  (Bug#36083)
+
+2019-06-15  Eli Zaretskii  <eliz@gnu.org>
+
+        Fix styling of Unicode codepoints in manuals
+
+        * doc/lispref/nonascii.texi (Character Properties):
+        * doc/lispref/display.texi (Glyphless Chars)
+        (Bidirectional Display):
+        * doc/emacs/search.texi (Lax Search):
+        * doc/emacs/text.texi (Quotation Marks):
+        * doc/emacs/basic.texi (Inserting Text): Canonicalize the
+        style of "U+NNNN CHARACTER NAME".  (Bug#35885)
+
+2019-06-15  Eli Zaretskii  <eliz@gnu.org>
+
+        Fix a few uses of quotes in user manual
+
+        * doc/emacs/text.texi (Quotation Marks):
+        * doc/emacs/display.texi (Text Display):
+        * doc/emacs/basic.texi (Inserting Text): Fix some more
+        quotes.  (Bug#35885)
+
+2019-06-15  Eli Zaretskii  <eliz@gnu.org>
+
+        More minor copyedits in the Emacs manual
+
+        * doc/emacs/basic.texi (Arguments):
+        * doc/emacs/display.texi (Recentering, Text Display):
+        * doc/emacs/regs.texi (Text Registers, Rectangle Registers):
+        * doc/emacs/mark.texi (Disabled Transient Mark): Fix
+        inaccuracies and typos.  (Bug#35885)
+
+2019-06-15  Eli Zaretskii  <eliz@gnu.org>
+
+        Fix minor issues in the Emacs manual
+
+        * doc/emacs/search.texi (Regexp Replace, Regexps):
+        * doc/emacs/kmacro.texi (Keyboard Macro Query)
+        (Save Keyboard Macro): Fix inaccuracies and typos.
+        (Bug#35885)
+
+2019-06-15  Martin Rudalics  <rudalics@gmx.at>
+
+        Try to improve text on atomic windows in Elisp manual
+
+        * doc/lispref/windows.texi (Deleting Windows): Mention how
+        'delete-window' and 'delete-other-windows' handle atomic
+        windows.  Minor rewrite.
+        (Quitting Windows): Mention how 'quit-restore-window' handles
+        atomic windows and that it tries to avoid raising an error.
+        (Atomic Windows): Tell how to dissolve atomic windows.
+
+2019-06-15  Noam Postavsky  <npostavs@gmail.com>
+
+        Don't recommend insert-before-markers in process filters
+
+        See <https://lists.gnu.org/r/emacs-devel/2019-05/msg00062.html> and
+        Bug#35334.
+        * doc/lispref/processes.texi (Filter Functions): Go back to using
+        plain insert in the example filter.  Add note about updating window
+        point.
+
+2019-06-15  Noam Postavsky  <npostavs@gmail.com>
+
+        Disable byte-compile-cond-use-jump-table (Bug#35770)
+
+        * lisp/emacs-lisp/bytecomp.el (byte-compile-cond-use-jump-table): Set
+        to nil by default.
+
+        Don't merge to master, the bug is already fixed there.
+
+2019-06-15  Noam Postavsky  <npostavs@gmail.com>
+
+        Allow macros autoloaded as functions during bytecomp (Bug#36022)
+
+        * lisp/emacs-lisp/bytecomp.el (byte-compile-callargs-warn): Don't pass
+        symbols which don't have a known definition to
+        byte-compile--function-signature, it fails to compile code which
+        previously compiled successfully (for example, gnus.el until
+        2019-06-01 "* lisp/gnus/gnus.el: Mark autoloaded macros as such" which
+        autoloads some macros as if they were functions).
+
+2019-06-15  Glenn Morris  <rgm@gnu.org>
+
+        * lisp/gnus/gnus.el: Mark autoloaded macros as such.
+
+        This avoids a build failure.
+
+2019-06-15  Eli Zaretskii  <eliz@gnu.org>
+
+        Speed up redisplay of HELLO
+
+        * etc/HELLO: Set 'inhibit-compacting-font-caches' non-nil
+        locally.  (Bug#36032)
+
+        * lisp/files.el: Add 'inhibit-compacting-font-caches' to the
+        list of built-in variables for which we set up
+        'safe-local-variable' properties.
+
+2019-06-15  Eli Zaretskii  <eliz@gnu.org>
+
+        Improve documentation of 'safe-local-variable' property
+
+        * doc/lispref/variables.texi (File Local Variables): Document
+        how to define 'safe-local-variable' properties for built-in
+        variables.
+
+2019-06-15  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * lisp/emacs-lisp/package.el: Obey buffer-file-coding-system (bug#35739)
+
+        `url-insert-file-contents` saves in buffer-file-coding-system
+        the coding-system used to decode the contents.  Preserve this
+        as the contents is moved from buffer to string to buffer, and use
+        it when saving the contents to file, so as to try and better preserve
+        the original byte sequence.
+
+        (package--buffer-string, package--cs): New functions.
+        (package--check-signature): Encode `string` if a coding-system
+        was specified in buffer-file-coding-system.
+        (package--download-one-archive, package-install-from-archive):
+        Obey and preserve the buffer-file-coding-system if specified.
+
+        Do not merge.
+
+2019-06-15  Noam Postavsky  <npostavs@gmail.com>
+
+        Warn about wrong number of args for subrs (Bug#35767)
+
+        * lisp/emacs-lisp/bytecomp.el (byte-compile-callargs-warn): Don't
+        assume byte-compile-fdefinition will return non-nil.
+        * test/lisp/emacs-lisp/bytecomp-tests.el (bytecomp-warn-wrong-args)
+        (bytecomp-warn-wrong-args-subr): New tests.
+
+2019-06-15  Noam Postavsky  <npostavs@gmail.com>
+
+        Use plain symbols for eieio type descriptors (Bug#29220)
+
+        Since Emacs 26, eieio objects use a class record (with circular
+        references) as the type descriptor of the object record.  This causes
+        problems when reading back an object from a string, because the class
+        record is not `eq' to the canonical one (which means that read objects
+        don't satisfy the foo-p predicate).
+        * lisp/emacs-lisp/eieio.el (make-instance): As a (partial) fix, set
+        the record's type descriptor to a plain symbol for the type descriptor
+        when eieio-backward-compatibility is non-nil (the default).
+        * lisp/emacs-lisp/eieio-core.el (eieio--object-class): Call
+        eieio--class-object on the type tag when eieio-backward-compatibility
+        is non-nil.
+        (eieio-object-p): Use eieio--object-class instead of
+        eieio--object-class-tag.
+        * test/lisp/emacs-lisp/eieio-tests/eieio-test-persist.el
+        (eieio-test-persist-hash-and-vector)
+        (eieio-test-persist-interior-lists): Make into functions.
+        (eieio-persist-hash-and-vector-backward-compatibility)
+        (eieio-persist-hash-and-vector-no-backward-compatibility)
+        (eieio-test-persist-interior-lists-backward-compatibility)
+        (eieio-test-persist-interior-lists-no-backward-compatibility): New
+        tests which call them, eieio-backward-compatibility let-bound.
+
+2019-06-15  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Pacify GCC 9 -Wredundant-decls
+
+        * src/gmalloc.c (_fraghead) [!HYBRID_MALLOC]:
+        Make it static in this case, too.  This avoids having both
+        ‘extern struct list _fraghead[];’ and
+        ‘static struct list _fraghead[BLOCKLOG];’, which
+        GCC 9 complains about.
+
+2019-06-15  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Pacify librsvg 2.45.1 and later
+
+        * src/image.c (svg_load_image): Pacify librsvg 2.45.1 and later,
+        and add a FIXME comment about the deprecated librsvg functions.
+        Backport from master.
+
+2019-06-15  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Simplify xd_signature to pacify GCC 9
+
+        * src/dbusbind.c (xd_signature): Use simpler way to set up
+        the subsignature.  This also pacifies GCC 9 on Fedora 30 x86-64.
+        Backport from master.
+
+2019-06-15  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Pacify GCC when compiling unexelf.c on Fedora 30
+
+        * src/unexelf.c (unexec): Pacify GCC 9.
+
+2019-06-15  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Suppress GCC 9 “no longer supported” messages
+
+        * m4/manywarnings.m4 (gl_MANYWARN_ALL_GCC): Remove -Wchkp.
+        This suppresses a boatload of warnings of the form
+        “gcc: warning: switch ‘-Wchkp’ is no longer supported”.
+        when using GCC 9.  Do not merge to master.
+
+2019-06-15  Stefan Kangas  <stefankangas@gmail.com>
+
+        Fix docstring of bookmark-get-bookmark
+
+        * lisp/bookmark.el (bookmark-get-bookmark): Document optional
+        argument NOERROR. (bug#20148)
+
+2019-06-15  Noam Postavsky  <npostavs@gmail.com>
+
+        Avoid infloop in read-multiple-choice (Bug#32257)
+
+        * lisp/emacs-lisp/rmc.el (read-multiple-choice): When `read-char'
+        signals an error "Non-character input-event", call `read-event' to
+        take the non-character event out of the queue.  Don't merge to master,
+        we just use `read-event' directly there, rather than this solution
+        which relies a particular error message.
+
+2019-06-15  Eli Zaretskii  <eliz@gnu.org>
+
+        Improve documentation of decoding into a unibyte buffer
+
+        * doc/lispref/nonascii.texi (Explicit Encoding): Document what
+        happens when DESTINATION of decoding is a unibyte buffer.
+
+        * src/coding.c (Fdecode_coding_region)
+        (Fdecode_coding_string): Document what happens if DESTINATION
+        is a unibyte buffer.
+
+2019-06-15  Mauro Aranda  <maurooaranda@gmail.com>
+
+        Remove redundants "See" before @xref or @pxref (Bug#35793)
+
+        * doc/lispref/control.texi (Control Structures):
+        * doc/lispref/modes.texi (Search-based Fontification):
+        * doc/misc/cc-mode.texi (Filling and Line Breaking Commands)
+        (Auto-newline Insertion, Other Special Indentations):
+        * doc/misc/dbus.texi (Errors and Events):
+        * doc/misc/dired-x.texi (Find File At Point):
+        * doc/misc/eudc.texi (Display of Query Results, Inline Query Expansion):
+        * doc/misc/gnus-faq.texi (FAQ 3-11):
+        * doc/misc/gnus.texi (Group Parameters, Posting Styles)
+        (Spam Package Introduction):
+        * doc/misc/org.texi (LaTeX fragments, Previewing LaTeX fragments):
+        * doc/misc/reftex.texi (Commands):
+        Remove redundant "See" before cross references.
+        * doc/lispref/functions.texi (Function Safety): Redundant "see" is in
+        ignored text, but remove it anyway.
+        * doc/lispref/positions.texi (Skipping Characters): Remove redundant
+        "See" before cross references.  Change @xref to @pxref, which is
+        more suitable when at the end of a sentence.
+
+        Most of the redundants "See" found by Noam Postavsky.
+
+2019-06-15  Dario Gjorgjevski  <dario.gjorgjevski@gmail.com>
+
+        Fix customization type of recentf-max-saved-items
+
+        Change the customization type of recentf-max-saved-items to include
+        nil, as it is an allowed value (Bug#35771).
+        * lisp/recentf.el (recentf-max-saved-items): Change the customization
+        type in the defcustom.
+
+2019-06-15  Tom Levy  <tomlevy93@gmail.com>  (tiny change)
+
+        Fix a typo in ELisp manual
+
+        * doc/lispref/sequences.texi (Sequence Functions): Fix a typo.
+        (Bug#35817)
+
+2019-06-15  Noam Postavsky  <npostavs@gmail.com>
+
+        Add option to disable help completion autoloading (Bug#28607)
+
+        * lisp/help-fns.el (help-enable-completion-auto-load): New option.
+        (help--symbol-completion-table): Consult it.
+        * doc/emacs/building.texi (Lisp Libraries): Document it.
+        * etc/NEWS: Announce it.
+        * doc/lispref/loading.texi (Autoload by Prefix): New section.
+        (Autoload): Reference it.
+
+2019-06-15  Noam Postavsky  <npostavs@gmail.com>
+
+        Don't segfault on force-window-update of deleted window
+
+        * src/window.c (Fforce_window_update): Do nothing for deleted
+        windows (Bug#35784).
+
+2019-06-15  Mauro Aranda  <maurooaranda@gmail.com>
+
+        Fix typo in ELisp manual
+
+        * doc/lispref/variables.texi (Directory Local Variables): Fix typo in
+        dir-locals-set-class-variables description.  (Bug#35799)
+
+2019-06-15  Mauro Aranda  <maurooaranda@gmail.com>
+
+        Remove repeated function call in picture.el
+
+        * lisp/textmodes/picture.el (picture-mode-map):  Remove repeated
+        define-key call.  (Bug#35772)
+
+2019-06-15  Basil L. Contovounesios  <contovob@tcd.ie>
+
+        Fix Hideshow key binding typo in Emacs manual
+
+        * doc/emacs/programs.texi (Hideshow): Add missing function and key
+        index entries.  Fix hs-toggle-hiding binding typo. (bug#35798)
+
+2019-06-15  Eric Abrahamsen  <eric@ericabrahamsen.net>
+
+        Backport: Fix name of gnus-summary-sort-by-mark(s)
+
+        * lisp/gnus/gnus-sum.el (gnus-summary-sort-by-marks): Needs the
+          "s", according to docs and keymap both. (bug#35765)
+
+        (cherry picked from commit 13248f7444630508cfc3b78a07e8d96613af11c8)
+
+2019-06-15  Eli Zaretskii  <eliz@gnu.org>
+
+        Remove from docs references to obsolete MULE variables
+
+        * src/search.c (search_buffer): Remove obsolete text from a
+        comment.
+        * src/fns.c (Fstring_make_unibyte): Remove obsolete text from
+        a doc string.
+
+2019-06-15  Konstantin Kharlamov  <Hi-Angel@yandex.ru>
+
+        Do potentially destructive operations in prepare-commit-msg
+
+        * build-aux/git-hooks/prepare-commit-msg: If someone occasionally puts
+        Signed-off line, it will likely get there through -s option of git.
+        Exploit this fact to abort before a user got a chance to type commit
+        message.  (Bug#35368)
+
+2019-06-15  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Backport: fix broken build on m68k
+
+        The GCC + valgrind fix caused the m68k build to fail (Bug#35711).
+        Simplify string allocation a bit to make similar problems less
+        likely in the future.
+        * src/alloc.c (sdata, SDATA_NBYTES, SDATA_DATA) [GC_CHECK_STRING_BYTES]:
+        Use the same implementation as with !GC_CHECK_STRING_BYTES,
+        as the special case is no longer needed.
+        (SDATA_ALIGN): New constant.
+        (SDATA_SIZE): Remove this macro, replacing with ...
+        (sdata_size): ... this new function.  All uses changed.
+        Properly account for sizes and alignments even in the m68k case,
+        and even if GC_CHECK_STRING_BYTES is not defined.
+
+2019-06-15  Noam Postavsky  <npostavs@gmail.com>
+
+        Handle GNUTLS_E_AGAIN in emacs_gnutls_read (Bug#34341)
+
+        Don't merge to master, this has already been fixed there by 2019-01-15
+        "Fix unlikely races with GnuTLS, datagrams".
+        * src/gnutls.c (emacs_gnutls_read): Similar to emacs_gnutls_write,
+        when gnutls_record_recv returns GNUTLS_E_AGAIN set errno to EGAIN.
+
+2019-06-15  Neil Roberts  <bpeeluk@yahoo.co.uk>
+
+        Let dir locals for more specific modes override those from less
+
+        The list of dir local variables to apply is now sorted by the number
+        of parent modes of the mode used as the key in the association list.
+        That way when the variables are applied in order the variables from
+        more specific modes will override those from less specific modes.
+
+        If there are directory entries in the list then they are sorted in
+        order of name length.  The list of modes for that dir is then
+        recursively sorted with the same mechanism.  That way variables tied
+        to a particular subdirectory override those in in a parent directory.
+
+        Previously the behaviour didn’t seem to be well defined anyway and was
+        dependent on the order they appeared in the file.  However this order
+        was changed in version 26.1 and it probably also depended on the
+        number of dir-local files that are merged.
+
+        Bug#33400
+
+        * lisp/files.el (dir-locals-get-sort-score, dir-locals-sort-variables)
+        (dir-locals-read-from-dir): Sort the dir locals so that more precise
+        modes and directory-specific entries have override lesser ones.
+        * doc/emacs/custom.texi (Directory Variables): Document the priority.
+
+2019-06-15  Eli Zaretskii  <eliz@gnu.org>
+
+        Improve documentation of Hexl mode
+
+        * doc/emacs/misc.texi (Editing Binary Files): Clarify
+        "insertion".  Improve wording.  Add a few Hexl commands.
+        (Bug#35580)
+
+2019-06-15  Alan Mackenzie  <acm@muc.de>
+
+        Fix description of (move-to-column <n> t) when column <n> is inside a tab
+
+        This fixes bug #35647.  State that when indent-tabs-mode is non-nil, spaces
+        are inserted before the tab rather than the tab being replaced by spaces.
+
+        * doc/lispref/text.texi (columns)
+        * src/indent.c (move-to-column): Make the above documentation amendment.
+
+2019-06-15  Noam Postavsky  <npostavs@gmail.com>
+
+        Recognize single quote attribute values in nxml and sgml (Bug#35381)
+
+        * lisp/textmodes/sgml-mode.el (sgml-specials): Add single quote.
+        (sgml-syntax-propertize-rules): Handle single quote.
+        * test/lisp/nxml/nxml-mode-tests.el (nxml-mode-font-lock-quotes): New
+        test.
+        * test/lisp/textmodes/sgml-mode-tests.el
+        (sgml-delete-tag-bug-8203-should-not-delete-apostrophe): Now passes.
+
+2019-06-15  Noam Postavsky  <npostavs@gmail.com>
+
+        Disable extra display of &#10; in nxml-mode (Bug#32897)
+
+        * lisp/nxml/nxml-mode.el (nxml-char-ref-display-extra): Don't put
+        display for the newline, it makes the indentation look wrong.
+
+2019-06-15  Noam Postavsky  <npostavs@gmail.com>
+
+        Fix nxml-get-inside (Bug#32003)
+
+        The change from 2016-01-16 "lisp/nxml: Use syntax-tables for comments"
+        made nxml-get-inside return non-nil for any string or comment,
+        including attribute strings.  This caused incorrect and therefore
+        indentation.
+        * lisp/nxml/nxml-rap.el: Update commentary to reflect changes to
+        nxml-mode parsing.
+        (nxml-get-inside): Only return non-nil when inside comments and
+        generic strings, not normal quote-delimited strings.
+        * test/lisp/nxml/nxml-mode-tests.el: New tests.
+
+2019-06-15  Eli Zaretskii  <eliz@gnu.org>
+
+        Fix positioning client buffer as instructed by emacsclient
+
+        * lisp/server.el (server-switch-buffer): Let-bind
+        switch-to-buffer-preserve-window-point to nil when switching
+        to the client buffer, when the client requested a specific
+        position.  (Bug#35602)
+
+2019-06-15  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * etc/package-keyring.gpg: Add the 2019 key (backport)
+
+2019-06-15  Vitalie Spinu  <spinuvit@gmail.com>
+
+        Fix incorrect cloning of eieio-instance-inheritor objects (Bug#34840)
+
+        * lisp/emacs-lisp/eieio-base.el (clone): Unbound slots of
+          eieio-instance-inheritor objects as documented in the docs string
+          and implemented in the original eieio implementation.
+
+2019-06-15  Vitalie Spinu  <spinuvit@gmail.com>
+
+        Fix cloning of eieio-named objects (Bug#22840)
+
+        * lisp/emacs-lisp/eieio-base.el (clone): Correctly set the name of the
+          cloned objects from eieio-named instances.
+
+2019-06-15  Basil L. Contovounesios  <contovob@tcd.ie>
+
+        Fix ibuffer-unmark-backward synopsis (bug#35572)
+
+        * lisp/ibuffer.el (ibuffer-mode): Fix synopsis of
+        ibuffer-unmark-backward along with other minor copy-edits.
+
+2019-06-15  Noam Postavsky  <npostavs@gmail.com>
+
+        Clarify handling of long options (Bug#24949)
+
+        * doc/emacs/cmdargs.texi (Emacs Invocation): Note that space can be
+        used instead of "=" only if an option requires an argument.
+
+2019-06-15  Eli Zaretskii  <eliz@gnu.org>
+
+        Improve documentation of the daemon and emacsclient
+
+        * doc/emacs/misc.texi (emacsclient Options):
+        * doc/emacs/cmdargs.texi (Initial Options): Document that
+        using --daemon=NAME will need to specify the same NAME when
+        invoking 'emacscilent'.  (Bug#35547)
+
+2019-06-15  Noam Postavsky  <npostavs@gmail.com>
+
+        * etc/NEWS.24: Belatedly announce delete-consecutive-dups.
+
+2019-06-15  Glenn Morris  <rgm@gnu.org>
+
+        * admin/update_autogen: Handle git worktree.
+
+2019-06-15  Noam Postavsky  <npostavs@gmail.com>
+
+        Update process filter example (Bug#35044)
+
+        * doc/lispref/processes.texi (Filter Functions): Use
+        insert-before-markers in the "ordinary" filter example, like
+        internal-default-process-filter does.
+
+2019-06-15  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+        * src/macfont.m (macfont_shape): Use convenient LGLYPH_NEW.
+
+2019-06-15  Noam Postavsky  <npostavs@gmail.com>
+
+        Recommend using font-lock-face over face (Bug#35044)
+
+        * doc/lispref/modes.texi (Precalculated Fontification): Explain
+        advantages of using font-lock-face over face.
+
+2019-06-15  Noam Postavsky  <npostavs@gmail.com>
+
+        Check if mouse_face_overlay was deleted (Bug#35273)
+
+        * src/xdisp.c (note_mouse_highlight): Check if the mouse_face_overlay
+        actually points to a buffer, before calling
+        mouse_face_overlay_overlaps on it.
+
+2019-06-15  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Port to platforms where tputs is in libtinfow
+
+        * configure.ac (tputs_library): Also try tinfow, ncursesw (Bug#33977).
+
+        (cherry picked from commit a3d52b3057c98bce581bc94912ef3ced6fad6f14)
+
+2019-06-15  Glenn Morris  <rgm@gnu.org>
+
+        * admin/admin.el (set-version): Check for increase in version length,
+        rather than a .50 version.
+
+2019-06-15  Noam Postavsky  <npostavs@gmail.com>
+
+        Be more careful about indent-sexp going over eol (Bug#35286)
+
+        * lisp/emacs-lisp/lisp-mode.el (indent-sexp): Only go over multiple
+        sexps if the end of line is within a sexp.
+        * test/lisp/emacs-lisp/lisp-mode-tests.el
+        (indent-sexp-stop-before-eol-comment)
+        (indent-sexp-stop-before-eol-non-lisp): New tests.
+
+2019-06-15  Basil L. Contovounesios  <contovob@tcd.ie>
+
+        Backport: Improve pure and side-effect-free docs
+
+        For discussion, see thread starting at:
+        https://lists.gnu.org/archive/html/emacs-devel/2019-04/msg00316.html
+        * doc/lispref/customize.texi (Composite Types): Do not overspecify
+        :match-alternatives predicates.
+        * doc/lispref/eval.texi (Intro Eval): Anchor definition of "side
+        effect" for cross-referencing...
+        * doc/lispref/functions.texi (What Is a Function): ...from here.
+        Define what a pure function is.
+        * doc/lispref/internals.texi (Writing Emacs Primitives): Describe
+        currently preferred approach to marking primitives as pure and
+        side-effect-free.
+        * doc/lispref/symbols.texi (Standard Properties): Expand description
+        of pure and side-effect-free properties.
+
+        (cherry picked from commit 4430a9b54fca266e48d0eb8b72d83706910f10b8)
+
+2019-06-15  Basil L. Contovounesios  <contovob@tcd.ie>
+
+        Backport: Avoid using obsolete indent-relative-maybe
+
+        * lisp/electric.el (electric-indent-functions-without-reindent):
+        * lisp/indent.el (indent-according-to-mode): Check for
+        indent-relative-first-indent-point in addition to its obsolete alias
+        indent-relative-maybe.
+        * lisp/obsolete/vi.el (vi-com-map): Use
+        indent-relative-first-indent-point in place of its obsolete alias
+        indent-relative-maybe.
+
+        (cherry picked from commit 0e468a620458fecd003c396050aa6deb722982c1)
+
+2019-06-15  Mauro Aranda  <maurooaranda@gmail.com>
+
+        Avoid false positives and false negatives of Info-quoted face
+
+        * lisp/info.el (Info-mode-font-lock-keywords): Modify the regexp, for
+        matching single quotes of opening single quote and closing single
+        quote, and avoid matching text followed by a curly quote when it is
+        not quoting. (Bug#35202)
+
+2019-06-15  Eli Zaretskii  <eliz@gnu.org>
+
+        Fix markup related to quoting in Info
+
+        * doc/misc/sc.texi (Citations): Fix markup of '>'.
+        * doc/misc/mh-e.texi (Speedbar): Fix markup in a @table.
+        * doc/misc/calc.texi (Yacas Language Mode): Fix a typo.
+        * doc/emacs/mark.texi (Setting Mark): Remove duplicate
+        quoting.  (Bug#35202)
+
+2019-06-15  Noam Postavsky  <npostavs@gmail.com>
+
+        Use pkg-config to find lcms2 CFLAGS and LIBS (Bug#30346)
+
+        * configure.ac: Use EMACS_CHECK_MODULES fors LCMS2 rather than
+        AC_SEARCH_LIBS.
+        * src/Makefile.in: Get LCMS2_LIBS and LCMS2_CFLAGS from configure,
+        instead of just LIBLCMS2.
+
+        (cherry picked from commit cb3863370cbe574810f796726faa39ba0de0a429)
+
+2019-06-15  Glenn Morris  <rgm@gnu.org>
+
+        Add a package: line to c-submit-bug-report.
+
+        * lisp/progmodes/cc-mode.el (c-submit-bug-report):
+        Add a Package: line for mail clients that do not support X- headers.
+
+2019-06-15  Glenn Morris  <rgm@gnu.org>
+
+        * admin/admin.el (set-version): Add NEWS headers for a .50 version.
+
+2019-06-15  Eli Zaretskii  <eliz@gnu.org>
+
+        Backport doc improvement in ELisp manual
+
+        * doc/lispref/processes.texi (Accepting Output): Backport:
+        document how do avoid race conditions while waiting for all of
+        the process's output to arrive.
+
+2019-06-15  Noam Postavsky  <npostavs@gmail.com>
+
+        Document insert-image-file's return value (Bug#32978)
+
+        * lisp/image-file.el (insert-image-file): Document return value.
+
+2019-06-15  Braun Gábor  <braungb88@gmail.com>  (tiny change)
+
+        Autoload cua-toggle-rectangle-mark (Bug#34947)
+
+        * lisp/emulation/cua-base.el (cua-toggle-rectangle-mark): Autoload it.
+        Library cua-base.el binds cua-toggle-rectangle-mark to a key in the
+        :set function in (defcustom cua-rectangle-mark-key ...), so it should
+        ensure that the command is defined.
+
+2019-06-15  Noam Postavsky  <npostavs@gmail.com>
+
+        Tell xclip not to expect job-control under eshell (Bug#35257)
+
+        * lisp/eshell/esh-proc.el (eshell-needs-pipe): Add "xclip" and other
+        programs that xclip.el (in GNU ELPA) calls with
+        `process-connection-type' bound to nil.
+
+2019-06-15  Basil L. Contovounesios  <contovob@tcd.ie>
+
+        Fix off-by-one-link error in image--set-property
+
+        * lisp/image.el (image--set-property): Ensure new value is set even
+        in the unlikely case that the plist is empty.  Fix off-by-one-link
+        error when deleting a property. (bug#35285)
+        * test/lisp/image-tests.el: New file.
+        (image--set-property): New test.
+
+2019-06-15  Glenn Morris  <rgm@gnu.org>
+
+        * admin/admin.el (make-manuals-dist--1):
+        Update for incompatible copy-file change re "directories".
+
+2019-06-15  Robert Pluim  <rpluim@gmail.com>
+
+        Document some compilation-mode faces
+
+        * doc/emacs/building.texi (Compilation Mode): Describe faces
+        available to affect appearance of compilation-mode buffers.
+
+2019-06-15  Eli Zaretskii  <eliz@gnu.org>
+
+        Mention the assignment form in "Copyright Assignment"
+
+        * doc/emacs/trouble.texi (Copyright Assignment): Mention the
+        copyright assignment form explicitly.  Suggested by Konstantin
+        Kharlamov <hi-angel@yandex.ru>.
+
+2019-06-15  Eli Zaretskii  <eliz@gnu.org>
+
+        Fix confusing wording in the user manual
+
+        * doc/emacs/maintaining.texi (VC Undo): Remove a potentially
+        inaccurate, outdated, and/or confusing sentence.  (Bug#35290)
+
+2019-06-15  Eli Zaretskii  <eliz@gnu.org>
+
+        Fix the MSDOS build when running under CWSDPMI
+
+        * src/msdos.c (the_only_tty_output): Define.
+        * src/msdos.h (the_only_tty_output): Declare.
+        * src/frame.c (make_terminal_frame) [MSDOS]:
+        * src/dispnew.c (init_display) [MSDOS]: Set up
+        f->output_data.tty pointer using the_only_tty_output, before
+        dereferencing the pointer.  This prevents crashes with DPMI
+        servers that provide NULL pointer protection.
+
+2019-06-15  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * lisp/progmodes/python.el: Be more careful about temp file removal
+
+        (python-shell-prompt-detect): Use unwind-protect to try and not leave
+        file behind in case of error.
+
+2019-06-15  Alexander Gramiak  <agrambot@gmail.com>
+
+        Backport: Plug memory leak in GTK x-display-monitor-attributes-list
+
+        * src/frame.c (free_monitors) [USE_GTK]: Define in the GTK case as
+        well.
+
+        * src/xfns.c (x-display-monitor-attributes-list) [USE_GTK]: Plug
+        memory leak. Use dupstring over xstrdup as gdk_monitor_get_model may
+        return NULL.
+
+2019-06-15  Alexander Gramiak  <agrambot@gmail.com>
+
+        Backport: * lisp/frame.el (frame--size-history): Fix infloop. (Bug#35272)
+
+2019-06-15  Robert Pluim  <rpluim@gmail.com>
+
+        Downcase charset
+
+        RFC 2046 specifies that the charset parameter is case-insensitive.
+
+        * lisp/gnus/gnus-icalendar.el (gnus-icalendar-with-decoded-handle):
+        Downcase charset.  Suggested by Christophe TROESTLER
+        <Christophe.TROESTLER@umons.ac.be>.  (Bug#35265).
+
+2019-06-15  Phillip Lord  <phillip.lord@russet.org.uk>
+
+        Update for Emacs-26
+
+        * nt/README.W32: Update details about packaging which changed for
+          Emacs-26.
+
+2019-06-15  Eli Zaretskii  <eliz@gnu.org>
+
+        * doc/lispref/display.texi (Showing Images): Fix a typo.  (Bug#35240
+
+2019-06-15  Nicolas Petton  <nicolas@petton.fr>
+
+        Bump Emacs version to 26.2
+
+        * README:
+        * configure.ac:
+        * msdos/sed2v2.inp:
+        * nt/README.W32: Bump Emacs version to 26.2.
+
+2019-06-15  Nicolas Petton  <nicolas@petton.fr>
+
+        * etc/HISTORY: Update for Emacs 26.2 release.
+
+        * etc/AUTHORS: Update.
 2019-05-25  Eric S. Raymond <esr@thyrsus.com>
 
         Implement and document XDG-style startup files under ~/.config.
@@ -65099,7 +65974,7 @@
 
 This file records repository revisions from
 commit 9d56a21e6a696ad19ac65c4b405aeca44785884a (exclusive) to
-commit 85829363f728c410e33ffdc3839202977b2115cc (inclusive).
+commit eca2677b1db94a126b6d2871526a1d6fce98353d (inclusive).
 See ChangeLog.1 for earlier changes.
 
 ;; Local Variables:
diff --git a/doc/emacs/display.texi b/doc/emacs/display.texi
index b9449f812a2..f92f7529ea9 100644
--- a/doc/emacs/display.texi
+++ b/doc/emacs/display.texi
@@ -202,7 +202,7 @@ screen lines between point and the top or bottom of the window
 argument, @kbd{C-u C-l}, simply recenters the line showing point.  A
 positive argument @var{n} moves line showing point @var{n} lines down
 from the top of the window.  An argument of zero moves point's line to
-the top of the window.  A negative argument @var{-n} moves point's
+the top of the window.  A negative argument @minus{}@var{n} moves point's
 line @var{n} lines from the bottom of the window.  When given an
 argument, @kbd{C-l} does not clear the screen or cycle through
 different screen positions.
diff --git a/doc/emacs/killing.texi b/doc/emacs/killing.texi
index 2d56f1d26e1..9b9c890331e 100644
--- a/doc/emacs/killing.texi
+++ b/doc/emacs/killing.texi
@@ -124,7 +124,7 @@ point, regardless of the number of spaces that existed previously
 (even if there were none before).  With a numeric argument @var{n}, it
 leaves @var{n} spaces before point if @var{n} is positive; if @var{n}
 is negative, it deletes newlines in addition to spaces and tabs,
-leaving @var{-n} spaces before point.  The command @code{cycle-spacing}
+leaving @minus{}@var{n} spaces before point.  The command @code{cycle-spacing}
 acts like a more flexible version of @code{just-one-space}.  It
 does different things if you call it repeatedly in succession.
 The first call acts like @code{just-one-space}, the next removes
diff --git a/doc/emacs/mark.texi b/doc/emacs/mark.texi
index 8ad5fc7c9e4..bbeb4cb039e 100644
--- a/doc/emacs/mark.texi
+++ b/doc/emacs/mark.texi
@@ -193,8 +193,8 @@ located before point, @kbd{M-@@} moves the mark backwards from its
 current position one word at a time.
 
   This command also accepts a numeric argument @var{n}, which tells it
-to advance the mark by @var{n} words.  A negative argument moves the
-mark back by @var{n} words.
+to advance the mark by @var{n} words.  A negative argument
+@minus{}@var{n} moves the mark back by @var{n} words.
 
 @kindex C-M-@@
 @findex mark-sexp
diff --git a/doc/emacs/programs.texi b/doc/emacs/programs.texi
index 28bfa5b578f..fe5093147b0 100644
--- a/doc/emacs/programs.texi
+++ b/doc/emacs/programs.texi
@@ -969,7 +969,7 @@ delimiters to enclose the text in the region.
   If you supply a prefix argument to @kbd{M-;} when a region is
 active, that specifies the number of comment delimiters to add or
 delete.  A positive argument @var{n} adds @var{n} delimiters, while a
-negative argument @var{-n} removes @var{n} delimiters.
+negative argument @minus{}@var{n} removes @var{n} delimiters.
 
   If the region is not active, and there is no existing comment on the
 current line, @kbd{M-;} adds a new comment to the current line.  If
@@ -1000,10 +1000,11 @@ lines.  When a region is active (@pxref{Mark}), @kbd{C-x C-;} either
 comments or uncomments the lines in the region.  If the region is not
 active, this command comments or uncomments the line point is on.
 With a positive prefix argument @var{n}, it operates on @var{n} lines
-starting with the current one; with a negative @var{n}, it affects
-@var{n} preceding lines.  After invoking this command with a negative
-argument, successive invocations with a positive argument will operate
-on preceding lines as if the argument were negated.
+starting with the current one; with a negative argument
+@minus{}@var{n}, it affects @var{n} preceding lines.  After invoking
+this command with a negative argument, successive invocations with a
+positive argument will operate on preceding lines as if the argument
+were negated.
 
 @findex comment-kill
 @kindex C-u M-;
diff --git a/doc/lispref/display.texi b/doc/lispref/display.texi
index 93c5217c362..68d308c7f79 100644
--- a/doc/lispref/display.texi
+++ b/doc/lispref/display.texi
@@ -2409,7 +2409,7 @@ Draw a box with lines of width 1, in color @var{color}.
 @item @code{(:line-width @var{width} :color @var{color} :style @var{style})}
 This way you can explicitly specify all aspects of the box.  The value
 @var{width} specifies the width of the lines to draw; it defaults to
-1.  A negative width @var{-n} means to draw a line of width @var{n}
+1.  A negative width @minus{}@var{n} means to draw a line of width @var{n}
 whose top and bottom parts occupy the space of the underlying text,
 thus avoiding any increase in the character height.
 
diff --git a/doc/lispref/searching.texi b/doc/lispref/searching.texi
index 24f30b4dac6..33455114dac 100644
--- a/doc/lispref/searching.texi
+++ b/doc/lispref/searching.texi
@@ -101,7 +101,7 @@ previous match.  If all these successive searches succeed, the
 function call succeeds, moving point and returning its new value.
 Otherwise the function call fails, with results depending on the value
 of @var{noerror}, as described above.  If @var{count} is a negative
-number -@var{n}, the search is done @var{n} times in the opposite
+number @minus{}@var{n}, the search is done @var{n} times in the opposite
 (backward) direction.
 @end deffn
 
@@ -1130,7 +1130,7 @@ previous match.  If all these successive searches succeed, the
 function call succeeds, moving point and returning its new value.
 Otherwise the function call fails, with results depending on the value
 of @var{noerror}, as described above.  If @var{count} is a negative
-number -@var{n}, the search is done @var{n} times in the opposite
+number @minus{}@var{n}, the search is done @var{n} times in the opposite
 (backward) direction.
 
 In the following example, point is initially before the @samp{T}.
diff --git a/doc/lispref/windows.texi b/doc/lispref/windows.texi
index 860c439d9a0..a6cb86eb84c 100644
--- a/doc/lispref/windows.texi
+++ b/doc/lispref/windows.texi
@@ -2582,25 +2582,47 @@ operations (@pxref{Preserving Window Sizes}).
 This function fails if no window can be split.  More often than not,
 this happens because no window is large enough to allow splitting.
 Setting @code{split-height-threshold} or @code{split-width-threshold}
-to lower values may help in this regard.  Spliting also fails when the
-selected frame has an @code{unsplittable} frame parameter;
+to lower values may help in this regard.  Splitting also fails when
+the selected frame has an @code{unsplittable} frame parameter;
 @pxref{Buffer Parameters}.
 @end defun
 
 @defun display-buffer-in-previous-window buffer alist
 This function tries to display @var{buffer} in a window where it was
-previously displayed.  If @var{alist} has a non-@code{nil}
-@code{inhibit-same-window} entry, the selected window is not eligible
-for reuse.  If @var{alist} contains a @code{reusable-frames} entry,
-its value determines which frames to search for a suitable window.
-
-If @var{alist} has a @code{previous-window} entry and the window
-specified by that entry is live and not dedicated to another buffer,
-that window will be preferred, even if it never showed @var{buffer}
+displayed previously.
+
+If @var{alist} contains a non-@code{nil} @code{inhibit-same-window}
+entry, the selected window is not eligible for use.  A dedicated
+window is usable only if it already shows @var{buffer}.  If
+@var{alist} contains a @code{previous-window} entry, the window
+specified by that entry is usable even if it never showed @var{buffer}
 before.
 
-This function will not choose the selected window if it finds another
-eligible window that has shown @var{buffer} previously.
+If @var{alist} contains a @code{reusable-frames} entry (@pxref{Buffer
+Display Action Alists}), its value determines which frames to search
+for a suitable window.  If @var{alist} contains no
+@code{reusable-frames} entry, this function searches just the selected
+frame if @code{display-buffer-reuse-frames} and @code{pop-up-frames}
+are both @code{nil}; it searches all frames on the current terminal if
+either of those variables is non-@code{nil}.
+
+If more than one window qualifies as usable according to these rules,
+this function makes a choice in the following order of preference:
+
+@itemize @bullet
+@item
+The window specified by any @code{previous-window} @var{alist} entry,
+provided it is not the selected window.
+
+@item
+A window that showed @var{buffer} before, provided it is not the
+selected window.
+
+@item
+The selected window if it is either specified by a
+@code{previous-window} @var{alist} entry or showed @var{buffer}
+before.
+@end itemize
 @end defun
 
 @defun display-buffer-use-some-window buffer alist
@@ -2850,7 +2872,9 @@ Ordering}).
 
 A major client of this is @code{display-buffer-reuse-window}, but all
 other action functions that try to reuse a window are affected as
-well.
+well.  @code{display-buffer-in-previous-window} consults it when
+searching for a window that previosuly displayed the buffer on another
+frame.
 
 @vindex inhibit-switch-frame@r{, a buffer display action alist entry}
 @item inhibit-switch-frame
diff --git a/doc/misc/gnus.texi b/doc/misc/gnus.texi
index 11ee62d5462..6f339140ad2 100644
--- a/doc/misc/gnus.texi
+++ b/doc/misc/gnus.texi
@@ -2126,7 +2126,7 @@ considered big.  The default value is 200.  If the group has more
 (unread and/or ticked) articles than this, Gnus will query the user
 before entering the group.  The user can then specify how many
 articles should be fetched from the server.  If the user specifies a
-negative number (@var{-n}), the @var{n} oldest articles will be
+negative number (@minus{}@var{n}), the @var{n} oldest articles will be
 fetched.  If it is positive, the @var{n} articles that have arrived
 most recently will be fetched.
 
diff --git a/lisp/window.el b/lisp/window.el
index 7117d4aacd6..a2335a6798c 100644
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -7767,10 +7767,13 @@ selected frame."
 (defun display-buffer-in-previous-window (buffer alist)
   "Display BUFFER in a window previously showing it.
 If ALIST has a non-nil `inhibit-same-window' entry, the selected
-window is not eligible for reuse.
+window is not usable.  A dedicated window is usable only if it
+already shows BUFFER.  If ALIST contains a `previous-window'
+entry, the window specified by that entry is usable even if it
+never showed BUFFER before.
 
 If ALIST contains a `reusable-frames' entry, its value determines
-which frames to search for a reusable window:
+which frames to search for a usable window:
   nil -- the selected frame (actually the last non-minibuffer frame)
   A frame   -- just that frame
   `visible' -- all visible frames
@@ -7782,12 +7785,17 @@ selected frame if `display-buffer-reuse-frames' and
 `pop-up-frames' are both nil; search all frames on the current
 terminal if either of those variables is non-nil.
 
-If ALIST has a `previous-window' entry, the window specified by
-that entry may override any other window found by the methods
-above, even if that window never showed BUFFER before.
+If more than one window is usable according to these rules,
+apply the following order of preference:
+
+- Use the window specified by any 'previous-window' ALIST entry,
+  provided it is not the selected window.
+
+- Use a window that showed BUFFER before, provided it is not the
+  selected window.
 
-Avoid using the selected window if another eligible window has
-shown BUFFER before."
+- Use the selected window if it is either specified by a
+  'previous-window' ALIST entry or showed BUFFER before."
   (let* ((alist-entry (assq 'reusable-frames alist))
          (inhibit-same-window
           (cdr (assq 'inhibit-same-window alist)))