Merge from origin/emacs-26
commit2a8f8f75639505b0f04757a1034480843fbd8398
authorGlenn Morris <rgm@gnu.org>
Fri, 20 Apr 2018 15:07:43 +0000 (20 08:07 -0700)
committerGlenn Morris <rgm@gnu.org>
Fri, 20 Apr 2018 15:07:43 +0000 (20 08:07 -0700)
treed17b3a2c7ea7c51aecb9de9466b9505378dacafb
parente927a36f3cf974a57094d10023ee075bb4596fb9
parent5de608f3edb54b4f8d9774e159d0fa99484d3ac8
Merge from origin/emacs-26

5de608f (origin/emacs-26) Update the documentation of 'perform-replace'
06245b6 * etc/NEWS: Another fix for the last change (noted by Juri Li...
8f6293c Fix use of @key in Texinfo manuals
f4c9894 Improve documentation of actual arglist
ce0e253 ; * etc/NEWS: Improve last change as proposed by Phil Sainty
b89ff0e Don't assume term-current-row cache is valid (Bug#31193)
326a296 ; * etc/NEWS: Mention 'display-buffer-in-major-side-window' c...
3bdc9a1 Fix flyspell-auto-correct-previous-word broken by recent change
a539eb5 * test/src/lread-tests.el (lread-test-bug-31186): New test.
3fa472b Fix undefined behaviour while looking for lexical-binding fil...
4341aac Minor wording improvement in "Bookmarks"

Conflicts:
test/src/lread-tests.el
14 files changed:
doc/emacs/search.texi
doc/lispintro/emacs-lisp-intro.texi
doc/lispref/functions.texi
doc/lispref/searching.texi
doc/misc/efaq.texi
doc/misc/eshell.texi
doc/misc/gnus.texi
doc/misc/org.texi
doc/misc/tramp.texi
etc/NEWS
lisp/term.el
lisp/textmodes/flyspell.el
src/lread.c
test/src/lread-tests.el