Merge from origin/emacs-26

07f8f9b (origin/emacs-26) ; * lisp/ldefs-boot.el: Update.
5cec2b0 * etc/HISTORY: Update for Emacs 26.1 release.
7c474e1 * etc/AUTHORS: Update.
ddc7bea ; * ChangeLog.3: Update.
3557460 ; * admin/authors.el: Update.
2f44d2d Note caveat for backward regexp searching in docstring (Bug#3...
3145d08 Update backtrace in Emacs Lisp Intro
43a9c26 Move window-point in bibtex-search-entry
4bb2741 More fixes of Intro to Emacs Lisp
c57c226 ; * doc/emacs/misc.texi (FFAP): Fix a typo.  (Bug#31580)
0a51113 Add a footnote to Emacs Lisp Intro
5eabe4a ; * doc/emacs/msdos.texi (ls in Lisp): Fix a typo.  (Bug#31575)
d5e0ceb * lisp/help.el (with-help-window): Doc fix.  (Bug#31574)
e7952bd Fix some cross-references in emacs-lisp-intro.texi
a897959 Minor copyedits in Emacs manual in macos.texi

Conflicts:
	lisp/ldefs-boot.el

12 files changed, 649 insertions, 101 deletions

diff --git a/ChangeLog.3 b/ChangeLog.3
index 2f0ccc80ec6..b19d6bd7244 100644
--- a/ChangeLog.3
+++ b/ChangeLog.3
@@ -1,3 +1,524 @@
+2018-05-25  Noam Postavsky  <npostavs@gmail.com>
+
+	Note caveat for backward regexp searching in docstring (Bug#31584)
+
+	* src/search.c (Fre_search_backward): Emphasize that backwards
+	searches may give shorter than expected matches.
+	* doc/lispref/searching.texi (Regexp Search): Add an anchor for
+	re-search-backward to reference.
+
+2018-05-25  Eli Zaretskii  <eliz@gnu.org>
+
+	Update backtrace in Emacs Lisp Intro
+
+	* doc/lispintro/emacs-lisp-intro.texi (Making Errors): Update the
+	backtrace to match Emacs 26.  (Bug#31589)
+
+2018-05-24  Roland Winkler  <winkler@gnu.org>
+
+	Move window-point in bibtex-search-entry
+
+	* lisp/textmodes/bibtex.el (bibtex-search-entry): Move window-point
+	to record found.
+
+2018-05-24  Eli Zaretskii  <eliz@gnu.org>
+
+	More fixes of Intro to Emacs Lisp
+
+	* doc/lispintro/emacs-lisp-intro.texi (Finding More): Tell the
+	reader how to invoke 'M-.' without a tags table.  Add a
+	cross-reference to the Emacs manual for when a tags table does
+	need to be created.
+	(append save-excursion): Rephrase a confusing sentence.
+	(Bug#31578)
+
+2018-05-24  Eli Zaretskii  <eliz@gnu.org>
+
+	Add a footnote to Emacs Lisp Intro
+
+	* doc/lispintro/emacs-lisp-intro.texi (Run a Program): Describe
+	the detailed output of integer value evaluation in a footnote, to
+	prevent confusion.  (Bug#31579)
+
+2018-05-24  Eli Zaretskii  <eliz@gnu.org>
+
+	* lisp/help.el (with-help-window): Doc fix.  (Bug#31574)
+
+2018-05-23  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix some cross-references in emacs-lisp-intro.texi
+
+	* doc/lispintro/emacs-lisp-intro.texi (List Processing)
+	(Determining the Element, graph-body-print): Fix cross-references
+	to subsections that don't exist in the printed version of the
+	manual.  (Bug#31567)
+
+2018-05-23  Eli Zaretskii  <eliz@gnu.org>
+
+	Minor copyedits in Emacs manual in macos.texi
+
+	* doc/emacs/macos.texi (Mac / GNUstep Basics)
+	(Mac / GNUstep Events): Fix markup and capitalization.
+	(Bug#31568)
+
+2018-05-23  Noam Postavsky  <npostavs@gmail.com>
+
+	Clarify when to use advice-add vs add-function
+
+	* lisp/emacs-lisp/nadvice.el (add-function): Note in docstring that
+	advice-add should be used for named functions.
+
+2018-05-22  Eli Zaretskii  <eliz@gnu.org>
+
+	Minor formatting tweak in the Emacs manual
+
+	* doc/emacs/custom.texi (Directory Variables): Don't have 2
+	footnotes back to back, it looks bad in HTML.  (Bug#31555)
+
+2018-05-22  Eli Zaretskii  <eliz@gnu.org>
+
+	Update comments in Intro to Emacs Lisp
+
+	* doc/lispintro/emacs-lisp-intro.texi: Explain in the comments
+	what are roman page numbers in Preface about.  (Bug#31541)
+
+2018-05-21  Noam Postavsky  <npostavs@gmail.com>
+
+	* etc/NEWS: Mention change in `edebug-prin1-to-string'.
+
+2018-05-21  Eli Zaretskii  <eliz@gnu.org>
+
+	Another attempt to fix sql.el
+
+	* lisp/progmodes/sql.el (sql-product-interactive): Fix calculation
+	of the SQL buffer name.  (Bug#31446)
+
+2018-05-21  Eli Zaretskii  <eliz@gnu.org>
+
+	Update binding of 'M-.' in Intro to Emacs Lisp
+
+	* doc/lispintro/emacs-lisp-intro.texi (On Reading this Text)
+	(Finding More, Buffer Related Review, Buffer Exercises)
+	(Find a File, Conclusion): 'M-.' is now bound to
+	'xref-find-definitions'.  (Bug#31542)
+
+2018-05-21  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix a typo in last change in sql.el
+
+	* lisp/progmodes/sql.el (sql-product-interactive): Use 'null',
+	not 'zerop'.  (Bug#31446)
+
+2018-05-20  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix capitalization of mail headers
+
+	* doc/emacs/sending.texi (Mail Format, Mail Headers)
+	(Mail Aliases, Header Editing): Use consistent capitalization of
+	CC, BCC, and FCC.  (Bug#31532)
+
+2018-05-20  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix buffer names in sql.el
+
+	* lisp/progmodes/sql.el (sql-product-interactive): Fix the way the
+	buffer name is determined by prefix arg.  (Bug#31446)
+
+2018-05-20  Eli Zaretskii  <eliz@gnu.org>
+
+	Minor fixes in the Emacs manual
+
+	* doc/emacs/misc.texi (Gnus Group Buffer): Fix a typo.  (Bug#31534)
+	(Single Shell): Rephrase an unclear sentence.  (Bug#31535)
+	(Remote Host): Use @command where appropriate.  (Bug#31536)
+
+2018-05-19  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix a typo in rmail.texi
+
+	* doc/emacs/rmail.texi (Rmail Summary Edit): Add markup to 'nil'.
+	(Bug#31533)
+
+2018-05-18  Paul Eggert  <eggert@cs.ucla.edu>
+
+	* etc/PROBLEMS: Document Bug#31305.
+
+2018-05-18  Lars Ingebrigtsen  <larsi@gnus.org>
+
+	(gnus-blocked-images): Clarify privacy implications
+
+	* lisp/gnus/gnus-art.el (gnus-blocked-images): Clarify the privacy
+	implication of altering the value of this variable.
+
+	(cherry picked from commit f4d9fd3dd45f767eca33fbf1beee40da790fa74e)
+
+2018-05-18  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix a typo in describing input methods
+
+	* lisp/help-mode.el (help-make-xrefs): Fix a typo.  (Bug#31448)
+
+2018-05-14  Eli Zaretskii  <eliz@gnu.org>
+
+	Clarify the mode-line indicators in CC Mode
+
+	* doc/emacs/programs.texi (Electric C): Explain '*' and '/' in the
+	CC Mode mode-line.  (Bug31445)
+
+2018-05-12  João Távora  <joaotavora@gmail.com>
+
+	Fix filesystem littering by Flymake's legacy backend
+
+	The Flymake legacy "proc" backend, which is active by default will try
+	to syntax-check foo.c/foo.cpp and many other types of files, but on
+	failing to find a suitable Makefile target, will fail.  There's
+	nothing wrong with that except that it used to leave behind the
+	foo_flymake.c and foo_flymake.cpp auxiliary files behind, littering
+	the filesystem.
+
+	* lisp/progmodes/flymake-proc.el (flymake-proc-legacy-flymake):
+	Call init-function inside of the unwind-protect.
+
+2018-05-12  Paul Eggert  <eggert@cs.ucla.edu>
+
+	* doc/emacs/help.texi: Fix paren typo.
+
+2018-05-11  Eli Zaretskii  <eliz@gnu.org>
+
+	More minor changes in shell-related nodes of Emacs manual
+
+	* doc/emacs/misc.texi (Interactive Shell): Clarify how the window
+	that displays "*shell*" is selected.
+	(Shell Prompts): Fix a typo.  Reported by Jorge
+	<jorge+list@disroot.org> in emacs-manual-bugs.
+
+2018-05-11  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix inaccuracies in "Shell Ring" node of Emacs manual
+
+	* doc/emacs/misc.texi (Shell Ring): Don't mention 'M-s' and don't
+	insist on Shell history commands being "jsut like" similar
+	commands that operate on minibuffer history.  Reported by Jorge
+	<jorge+list@disroot.org> in emacs-manual-bugs.
+
+2018-05-11  Eli Zaretskii  <eliz@gnu.org>
+
+	Improve documentation of kmacro commands and variables.
+
+	* lisp/kmacro.el (kmacro-start-macro-or-insert-counter)
+	(kmacro-counter, kmacro-set-format, kmacro-set-counter)
+	(kmacro-add-counter, kmacro-counter-format)
+	(kmacro-insert-counter): Clarify and improve the doc strings.
+	(Bug#31243)
+
+2018-05-11  Noam Postavsky  <npostavs@gmail.com>
+
+	* doc/man/emacs.1.in: Document --fg-daemon and --bg-daemon.
+
+2018-05-08  Noam Postavsky  <npostavs@gmail.com>
+
+	Don't check non-X frames for z order (Bug#31373)
+
+	* src/xfns.c (x_frame_list_z_order): Only use frames with
+	`output_method' set to `output_x_window'.
+
+2018-05-07  Alan Third  <alan@idiocy.org>
+
+	Check NSWindow is actually a frame
+
+	* src/nsfns.m (Fns_frame_list_z_order): Check NSWindow is an instance
+	of EmacsView before treating it as one.
+
+2018-05-06  Xu Chunyang  <mail@xuchunyang.me>
+
+	Fix gud-statement for pdb
+
+	* lisp/progmodes/gud.el (pdb): Fix the gud-print implementation.
+	(Bug#31363)
+
+2018-05-04  Eli Zaretskii  <eliz@gnu.org>
+
+	Document 'custom-group'
+
+	* doc/lispref/customize.texi (Group Definitions): Document the
+	'custom-group' property.
+
+2018-05-04  Eli Zaretskii  <eliz@gnu.org>
+
+	A minor addition to etc/DEBUG
+
+	* etc/DEBUG: Add a note for macOS users who get error messages
+	when trying to run GDB.
+
+2018-05-04  Daniel Pittman  <slippycheeze@google.com>  (tiny change)
+
+	Avoid errors in ispell.el when Enchant returns empty extra chars
+
+	* lisp/textmodes/ispell.el (ispell--get-extra-word-characters):
+	Handle the case of empty extra characters returned by the
+	Enchant '-lsmod' command. (Bug#31344)
+
+2018-05-04  Eli Zaretskii  <eliz@gnu.org>
+
+	Make 'ispell-initialize-spellchecker-hook' work again
+
+	* lisp/textmodes/ispell.el (ispell-base-dicts-override-alist):
+	Defvar it to allow dynamic binding.  (Bug#31341)
+
+2018-05-04  Noam Postavsky  <npostavs@gmail.com>
+
+	Handle selected_window change in prepare_menu_bars (Bug#31312)
+
+	* src/xdisp.c (redisplay_internal): Check selected_window after
+	calling prepare_menu_bars, since it can call lisp hooks.
+
+2018-05-03  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix report-emacs-bug via mailclient on MS-Windows
+
+	* lisp/net/browse-url.el (browse-url-default-windows-browser):
+	On MS-Windows, call url-unhex-string only for file:// URLs.
+	(Bug#31351)
+
+2018-05-02  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Port collation tests to glibc 2.27
+
+	* test/src/fns-tests.el (fns-tests-collate-strings)
+	(fns-tests-collate-sort): Don’t make unportable assumptions
+	about how en_US.UTF-8 collation works.  These assumptions
+	are not true on Fedora 28, which ships with glibc 2.27.
+
+2018-05-01  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Port --enable-gcc-warnings to GCC 8
+
+	Backport from master.
+	* lib-src/emacsclient.c (fail):
+	Do not dereference a null pointer.
+	* src/frame.c (delete_frame):
+	Add a decl with UNINIT to work around GCC bug 85563.
+	* src/menu.h (finish_menu_items):
+	Do not use attribute const.
+	* src/regex.c (analyze_first): Use FALLTHROUGH, not a comment.
+
+2018-04-30  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Advise CFLAGS= operand, not in environment, when configuring
+
+	Backport from master.
+
+2018-04-28  Eli Zaretskii  <eliz@gnu.org>
+
+	Update the Emacs FAQ
+
+	* doc/misc/efaq.texi (Latest version of Emacs): Update versions.
+	(New in Emacs 26): New node.
+
+	* admin/release-process: Mention the FAQ update as part of the
+	release.
+
+2018-04-28  Eli Zaretskii  <eliz@gnu.org>
+
+	* etc/DEBUG: Minor copyedits.
+
+2018-04-26  Alan Third  <alan@idiocy.org>
+
+	Clarify wording of NS drag n drop documentation
+
+	* doc/emacs/macos.texi (Mac / GNUstep Events): Clarify wording of
+	ns-drag-n-drop description.
+
+2018-04-25  Basil L. Contovounesios  <contovob@tcd.ie>
+
+	Improve kill-related documentation (bug#31209)
+
+	* doc/lispref/text.texi (Low-Level Kill Ring): Fix typo under
+	current-kill.  Mention interprogram-paste-function under kill-new
+	and kill-append.
+	* lisp/simple.el (save-interprogram-paste-before-kill, kill-new)
+	(kill-append-merge-undo, kill-append): Touch-up docstrings.
+
+2018-04-24  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* lisp/simple.el (region-extract-function): Don't hide the 'nil' case.
+
+2018-04-22  Karl Otness  <karl@karlotness.com>  (tiny change)
+
+	Fix pre- and post-command-hook errors in term.el
+
+	Before this patch, after the terminal process dies the command
+	hooks added in term-mode's char mode would produce errors.
+	This fix removes these hooks when the process dies.
+	* lisp/term.el (term-handle-exit): Remove pre-command-hook and
+	post-command-hook because the process is dead.  (Bug#31236)
+
+2018-04-22  Charles A. Roelli  <charles@aurox.ch>
+
+	* doc/lispref/display.texi (Glyphless Chars): Fix grammar.
+
+2018-04-21  Alan Third  <alan@idiocy.org>
+
+	Fix macOS drag n drop event documentation
+
+	* doc/emacs/macos.texi (Mac / GNUstep Customization): Remove
+	references to color panel.
+	(Mac / GNUstep Events): Remove ns-drag-file, and add ns-drag-n-drop.
+
+2018-04-20  Eli Zaretskii  <eliz@gnu.org>
+
+	Update the documentation of 'perform-replace'
+
+	* doc/lispref/searching.texi (Search and Replace): Update the
+	documentation of 'perform-replace'.
+
+2018-04-20  Martin Rudalics  <rudalics@gmx.at>
+
+	* etc/NEWS: Another fix for the last change (noted by Juri Linkov)
+
+2018-04-19  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix use of @key in Texinfo manuals
+
+	* doc/misc/efaq-w32.texi (Location of init file):
+	* doc/misc/org.texi (Editing source code, Export settings)
+	(Closing items, Drawers, Structure editing):
+	* doc/misc/gnus.texi (Spam and Ham Processors, Terminology):
+	* doc/misc/calc.texi (Keypad Functions Menu, Keypad Binary Menu)
+	(Keypad Vectors Menu, Keypad Main Menu, Basic Arithmetic)
+	(Symbolic Mode):
+	* doc/misc/sc.texi (Electric References):
+	* doc/misc/info.texi (Help-^L):
+	* doc/misc/reftex.texi (Reference Styles):
+	* doc/misc/idlwave.texi (Troubleshooting, Examining Variables)
+	(Lesson III---User Catalog, Using the Shell):
+	* doc/misc/eshell.texi (Bugs and ideas):
+	* doc/misc/ada-mode.texi (Automatic Casing):
+	* doc/misc/ediff.texi (Selective Browsing):
+	* doc/misc/vip.texi (Customizing Constants):
+	* doc/misc/pcl-cvs.texi (Selected files):
+	* doc/misc/efaq.texi (Replying to the sender of a message)
+	(Basic keys, No Meta key, Matching parentheses)
+	(Origin of the term Emacs, Installing Texinfo documentation)
+	(Learning how to do something, Emacs manual, Extended commands):
+	* doc/misc/viper.texi (Rudimentary Changes):
+	* doc/misc/tramp.texi (Frequently Asked Questions):
+	* doc/emacs/kmacro.texi (Basic Keyboard Macro):
+	* doc/emacs/frames.texi (Frame Commands):
+	* doc/emacs/msdos.texi (Windows Keyboard):
+	* doc/emacs/search.texi (Query Replace):
+	* doc/lispintro/emacs-lisp-intro.texi (Keybindings)
+	(Note for Novices):
+	* doc/lispref/tips.texi (Key Binding Conventions): Fix use of
+	@key.  For the details, see
+	http://lists.gnu.org/archive/html/emacs-devel/2018-04/msg00390.html.
+
+2018-04-19  Eli Zaretskii  <eliz@gnu.org>
+
+	Improve documentation of actual arglist
+
+	* doc/lispref/functions.texi (Function Documentation): Advise
+	against using '(fn ARGLIST)' method of advertising a calling
+	convention when the old calling convention is deprecated.
+	(Bug#31191)
+
+2018-04-18  Noam Postavsky  <npostavs@gmail.com>
+
+	Don't assume term-current-row cache is valid (Bug#31193)
+
+	* lisp/term.el (term-down): Call `term-current-row' instead of
+	directly accessing the variable `term-current-row.  Following a resize
+	of the terminal's window, `term-current-row' is reset to nil, so it is
+	not safe to assume it is a number.
+
+2018-04-17  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix flyspell-auto-correct-previous-word broken by recent change
+
+	* lisp/textmodes/flyspell.el (flyspell-auto-correct-word): Keep
+	flyspell-auto-correct-region also when repeatedly invoking
+	flyspell-auto-correct-previous-word.  (Bug#31188)
+
+2018-04-17  Eli Zaretskii  <eliz@gnu.org>
+
+	* test/src/lread-tests.el (lread-test-bug-31186): New test.
+
+2018-04-17  Andreas Schwab  <schwab@suse.de>
+
+	Fix undefined behaviour while looking for lexical-binding file variable (bug 31186)
+
+	* src/lread.c (lisp_file_lexically_bound_p): Reset
+	beg_end_state before reading variable or value.
+
+2018-04-15  Eli Zaretskii  <eliz@gnu.org>
+
+	Minor wording improvement in "Bookmarks"
+
+	* doc/emacs/regs.texi (Bookmarks): Improve wording.  Suggested by
+	"Siraphob (Ben) Phipathananunth" <siraben@disroot.org>.
+
+2018-04-14  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix building etc/DOC in the MSDOS port
+
+	* msdos/sed1v2.inp (lisp.mk): Fix escaping in Sed commands.
+
+2018-04-14  Eli Zaretskii  <eliz@gnu.org>
+
+	* lisp/select.el (gui-get-selection): Doc fix.
+
+2018-04-13  Alan Mackenzie  <acm@muc.de>
+
+	Complete documentation of syntax flags by adding `c'
+
+	* doc/lispref/syntax.texi ("Syntax Table Internals"): Add entry for `c'
+	as `(1 lsh 23)'.
+
+2018-04-13  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix typos and minor wording issues in ELisp manual
+
+	* doc/lispref/internals.texi (Writing Emacs Primitives):
+	* doc/lispref/display.texi (Temporary Displays): Fix typos.
+	* doc/lispref/text.texi (Filling, Changing Properties)
+	(Transposition): Clarify and fix typos.
+	* doc/lispref/positions.texi (Screen Lines): Improve wording.
+	* doc/lispref/modes.texi (Minor Mode Conventions)
+	(Font Lock Multiline): Fix typos.
+	* doc/lispref/variables.texi (Dynamic Binding Tips): Fix a
+	cross-reference.  Fix a typo.
+	* doc/lispref/sequences.texi (Sequence Functions): Fix typos.
+	(Bug#31143)
+
+2018-04-13  Eli Zaretskii  <eliz@gnu.org>
+
+	Avoid segfault in processes of type 'pipe'
+
+	* src/process.c (Fmake_pipe_process): Set up the decoding and
+	encoding buffers.  For the details, see
+	http://lists.gnu.org/archive/html/emacs-devel/2018-04/msg00295.html.
+
+2018-04-13  Robert Pluim  <rpluim@gmail.com>
+
+	Remove repetitions in documentation strings
+
+	* lisp/bindings.el (right-word): Remove repetition
+	(left-word): Likewise.
+
+	* lisp/image-mode.el (image-mode-as-hex): Likewise.
+
+	* lisp/cedet/semantic/tag-ls.el (semantic-tag-similar-p): Likewise.
+
+	* lisp/textmodes/reftex-vars.el (reftex-view-crossref-extra): Likewise
+
+2018-04-12  Eli Zaretskii  <eliz@gnu.org>
+
+	* lisp/image.el (image-load-path): Doc fix.
+
+2018-04-09  Nicolas Petton  <nicolas@petton.fr>
+
+	* etc/AUTHORS: Regenerate.
+
 2018-04-09  Charles A. Roelli  <charles@aurox.ch>
 
 	* lisp/files.el (kept-new-versions): Improve documentation string.
@@ -59211,7 +59732,7 @@
 
 This file records repository revisions from
 commit 9d56a21e6a696ad19ac65c4b405aeca44785884a (exclusive) to
-commit c8ffca525c60e4a17d9687d92e3304bb27a8d446 (inclusive).
+commit 35574609dd09e2eab0301309b0e3bf831f627fcc (inclusive).
 See ChangeLog.1 for earlier changes.
 
 ;; Local Variables:
diff --git a/admin/authors.el b/admin/authors.el
index 25871abe95d..1ff98fa588a 100644
--- a/admin/authors.el
+++ b/admin/authors.el
@@ -958,7 +958,7 @@ in the repository.")
     ("nxml/test.invalid.xml" . "test-invalid.xml")
     ("nxml/test.valid.xml" . "test-valid.xml")
     ("automated/Makefile.in" . "test/Makefile.in")
-    ("rmailmm.el" . "test/rmailmm.el")
+    ("test/rmailmm.el" . "rmailmm.el")
     ;; The one in lisp is eshell/eshell.el.
     ("eshell.el" . "eshell-tests.el")
     ("automated/eshell.el" . "eshell-tests.el")
diff --git a/doc/emacs/macos.texi b/doc/emacs/macos.texi
index cfb63fe1d8c..34b645dbc17 100644
--- a/doc/emacs/macos.texi
+++ b/doc/emacs/macos.texi
@@ -59,7 +59,7 @@ default).  A value of @code{control}, @code{meta}, @code{alt},
 modifier keys; a value of @code{left} means be the same key as
 @code{ns-alternate-modifier}; a value of @code{none} tells Emacs to
 ignore them, in which case you get the default behavior of macOS
-accentuation system from the right option key.
+accentuation system from the right @key{Option} key.
 
   @kbd{S-mouse-1} adjusts the region to the click position,
 just like @kbd{mouse-3} (@code{mouse-save-then-kill}); it does not pop
@@ -170,7 +170,7 @@ the requested line (@code{ns-open-file-select-line}).
 This event occurs when a user drags an object from another application
 into an Emacs frame.  The default behavior is to open a file in the
 window under the mouse, or to insert text at point of the window under
-the mouse.  It may sometimes be necessary to use the @key{META} key in
+the mouse.  It may sometimes be necessary to use the @key{Meta} key in
 conjunction with dragging to force text insertion.
 
 @item ns-change-font
diff --git a/doc/emacs/misc.texi b/doc/emacs/misc.texi
index ac52603ed7a..7c595388ead 100644
--- a/doc/emacs/misc.texi
+++ b/doc/emacs/misc.texi
@@ -2854,7 +2854,7 @@ which has a similar feature of its own.
 @cindex finding file at point
 
   The FFAP package replaces certain key bindings for finding files,
-such as @kbd{C-x C-f}, with commands that provide more sensitive
+such as @kbd{C-x C-f}, with commands that provide more sensible
 defaults.  These commands behave like the ordinary ones when given a
 prefix argument.  Otherwise, they get the default file name or URL
 from the text around point.  If what is found in the buffer has the
diff --git a/doc/emacs/msdos.texi b/doc/emacs/msdos.texi
index b1846919b67..679bdd3e83b 100644
--- a/doc/emacs/msdos.texi
+++ b/doc/emacs/msdos.texi
@@ -341,7 +341,7 @@ it doesn't support all of them.  Here's the list of the switches it
 does support: @option{-A}, @option{-a}, @option{-B}, @option{-C},
 @option{-c}, @option{-G}, @option{-g}, @option{-h}, @option{-i}, @option{-n},
 @option{-R}, @option{-r}, @option{-S}, @option{-s}, @option{-t}, @option{-U},
-@option{-u}, @option{v}, and @option{-X}.  The @option{-F} switch is
+@option{-u}, @option{-v}, and @option{-X}.  The @option{-F} switch is
 partially supported (it appends the character that classifies the
 file, but does not prevent symlink following).
 
diff --git a/doc/lispintro/emacs-lisp-intro.texi b/doc/lispintro/emacs-lisp-intro.texi
index 81f26728e0a..e5a20110125 100644
--- a/doc/lispintro/emacs-lisp-intro.texi
+++ b/doc/lispintro/emacs-lisp-intro.texi
@@ -1037,7 +1037,14 @@ putting them between parentheses.  The parentheses mark the boundaries
 of the list.  Sometimes a list is preceded by an apostrophe @samp{'},
 called a @dfn{single-quote} in Lisp.@footnote{A single-quote is an
 abbreviation for the special form @code{quote}; you need not think
-about special forms now.  @xref{Complications}.}  Lists are the basis
+about special forms now.
+@ifnottex
+@xref{Complications}.
+@end ifnottex
+@iftex
+@xref{Lisp Interpreter}.
+@end iftex
+}  Lists are the basis
 of Lisp.
 
 @menu
@@ -1295,11 +1302,13 @@ hand parenthesis of the following list and then type @kbd{C-x C-e}:
 
 @c use code for the number four, not samp.
 @noindent
-You will see the number @code{4} appear in the echo area.  (What
-you have just done is evaluate the list.  The echo area
-is the line at the bottom of the screen that displays or echoes
-text.)  Now try the same thing with a quoted list:  place the cursor
-right after the following list and type @kbd{C-x C-e}:
+You will see the number @code{4} appear in the echo area@footnote{
+Emacs shows integer values in decimal, in octal and in hex, and also
+as a character, but let's ignore this convenience feature for now.
+}.  (What you have just done is evaluate the list.  The echo area is
+the line at the bottom of the screen that displays or echoes text.)
+Now try the same thing with a quoted list: place the cursor right
+after the following list and type @kbd{C-x C-e}:
 
 @smallexample
 '(this is a quoted list)
@@ -1370,10 +1379,12 @@ following in it:
 ---------- Buffer: *Backtrace* ----------
 Debugger entered--Lisp error: (void-function this)
   (this is an unquoted list)
-  eval((this is an unquoted list))
-  eval-last-sexp-1(nil)
+  eval((this is an unquoted list) nil)
+  elisp--eval-last-sexp(nil)
   eval-last-sexp(nil)
-  call-interactively(eval-last-sexp)
+  funcall-interactively(eval-last-sexp nil)
+  call-interactively(eval-last-sexp nil nil)
+  command-execute(eval-last-sexp)
 ---------- Buffer: *Backtrace* ----------
 @end group
 @end smallexample
@@ -4617,16 +4628,25 @@ file, you can use the @code{xref-find-definitions} function to jump to
 it.  @code{xref-find-definitions} works with a wide variety of
 languages, not just Lisp, and C, and it works with non-programming
 text as well.  For example, @code{xref-find-definitions} will jump to
-the various nodes in the Texinfo source file of this document.
+the various nodes in the Texinfo source file of this document
+(provided that you've run the @command{etags} utility to record all
+the nodes in the manuals that come with Emacs; @pxref{Create tags
+Table,,, emacs, The GNU Emacs Manual}).
 
 To use the @code{xref-find-definitions} command, type @kbd{M-.}
 (i.e., press the period key while holding down the @key{META} key, or
 else type the @key{ESC} key and then type the period key), and then,
 at the prompt, type in the name of the function whose source code you
 want to see, such as @code{mark-whole-buffer}, and then type
-@key{RET}.  Emacs will switch buffers and display the source code for
-the function on your screen.  To switch back to your current buffer,
-type @kbd{C-x b @key{RET}}.  (On some keyboards, the @key{META} key is
+@key{RET}.  (If the command doesn't prompt, invoke it with an
+argument: @kbd{C-u M-.}; @pxref{Interactive Options}.)  Emacs will
+switch buffers and display the source code for the function on your
+screen@footnote{
+If instead of showing the source code for a Lisp function, Emacs asks
+you which tags table to visit, invoke @kbd{M-.} from a buffer whose
+major mode is Emacs Lisp or Lisp Interaction.
+}.  To switch back to your current buffer, type @kbd{M-,} or
+@kbd{C-x b @key{RET}}.  (On some keyboards, the @key{META} key is
 labeled @key{ALT}.)
 
 @cindex Library, as term for ``file''
@@ -5298,8 +5318,8 @@ in GNU Emacs 22
 
 The @code{append-to-buffer} function definition inserts text from the
 buffer in which you are currently to a named buffer.  It happens that
-@code{insert-buffer-substring} copies text from another buffer to the
-current buffer, just the reverse---that is why the
+@code{insert-buffer-substring} does just the reverse---it copies text
+from another buffer to the current buffer---that is why the
 @code{append-to-buffer} definition starts out with a @code{let} that
 binds the local symbol @code{oldbuf} to the value returned by
 @code{current-buffer}.
@@ -16401,9 +16421,9 @@ Install @code{graph-symbol}, @code{graph-blank},
 @iftex
 @ref{Readying a Graph, , Readying a Graph},
 @end iftex
-@ifinfo
+@ifnottex
 @ref{Columns of a graph},
-@end ifinfo
+@end ifnottex
 and @code{graph-body-print}.
 
 @need 800
@@ -19182,11 +19202,14 @@ Local variables can only be accessed
 within the @code{let} that defines them or the function that specifies
 them in an argument list (and within expressions called by them).
 
-@ignore
 @c texi2dvi fails when the name of the section is within ifnottex ...
+@ifnottex
 (@xref{Prevent confusion, , @code{let} Prevents Confusion}, and
+@end ifnottex
+@iftex
+(@xref{Permanent Installation, , @code{let} Prevents Confusion}, and
+@end iftex
 @ref{defun, , The @code{defun} Macro}.)
-@end ignore
 
 @node yank
 @appendixsec @code{yank}
diff --git a/doc/lispref/searching.texi b/doc/lispref/searching.texi
index 1e71947d279..1b6b80d31b2 100644
--- a/doc/lispref/searching.texi
+++ b/doc/lispref/searching.texi
@@ -1102,6 +1102,8 @@ comes back" twice.
 @end example
 @end deffn
 
+@c This anchor is referenced by re-search-backward's docstring.
+@anchor{re-search-backward}
 @deffn Command re-search-backward regexp &optional limit noerror count
 This function searches backward in the current buffer for a string of
 text that is matched by the regular expression @var{regexp}, leaving
diff --git a/etc/AUTHORS b/etc/AUTHORS
index 4552af915c1..a0cd4a7f58b 100644
--- a/etc/AUTHORS
+++ b/etc/AUTHORS
@@ -63,7 +63,7 @@ Adrian Robert: co-wrote ns-win.el
 and changed nsterm.m nsfns.m nsfont.m nsterm.h nsmenu.m configure.ac
   src/Makefile.in macos.texi README config.in emacs.c font.c keyboard.c
   nsgui.h nsimage.m xdisp.c image.c lib-src/Makefile.in lisp.h menu.c
-  Makefile.in and 79 other files
+  Makefile.in and 78 other files
 
 Ævar Arnfjörð Bjarmason: changed rcirc.el
 
@@ -94,7 +94,7 @@ Alan Mackenzie: wrote cc-awk.el
 and co-wrote cc-align.el cc-cmds.el cc-defs.el cc-engine.el cc-fonts.el
   cc-langs.el cc-mode.el cc-styles.el cc-vars.el
 and changed cc-mode.texi bytecomp.el subr.el edebug.el modes.texi
-  display.texi font-lock.el isearch.el programs.texi syntax.texi
+  syntax.texi display.texi font-lock.el isearch.el programs.texi
   follow.el help.el ispell.el lread.c control.texi cus-start.el doc.c
   eval.c frames.texi help-fns.el lisp.el and 133 other files
 
@@ -109,8 +109,8 @@ Alan Shutko: changed diary-lib.el calendar.el bindings.el cal-hebrew.el
 Alan Third: wrote dabbrev-tests.el
 and changed nsterm.m nsfns.m nsterm.h nsmenu.m frame.el macfont.m
   nsimage.m ns-win.el conf_post.h frame.c frame.h frames.texi keyboard.c
-  macfont.h picture.el rect.el Info.plist.in battery.el callproc.c
-  configure.ac emacs.c and 10 other files
+  macfont.h macos.texi picture.el rect.el Info.plist.in battery.el
+  callproc.c configure.ac and 11 other files
 
 Alastair Burt: changed gnus-art.el smiley.el
 
@@ -266,7 +266,7 @@ Andreas Politz: changed filenotify.el inotify.c bytecomp.el editfns.c
 Andreas Rottmann: changed emacsclient.1 emacsclient.c misc.texi server.el
 
 Andreas Schwab: changed configure.ac lisp.h process.c xdisp.c alloc.c
-  coding.c Makefile.in files.el fileio.c keyboard.c xterm.c fns.c lread.c
+  coding.c Makefile.in files.el fileio.c keyboard.c lread.c xterm.c fns.c
   editfns.c emacs.c src/Makefile.in print.c eval.c font.c xfns.c sysdep.c
   and 639 other files
 
@@ -389,7 +389,7 @@ Artem Chuprina: changed message.el
 Artur Malabarba: wrote char-fold-tests.el faces-tests.el isearch-tests.el
   let-alist.el simple-tests.el sort-tests.el tabulated-list-test.el
 and changed package.el isearch.el lisp/char-fold.el files.el
-  tabulated-list.el package-tests.el menu-bar.el replace.el bytecomp.el
+  tabulated-list.el package-test.el menu-bar.el replace.el bytecomp.el
   faces.el files-x.el custom.el custom.texi help-fns.el
   let-alist-tests.el simple.el subr-tests.el align.el bindings.el
   cl-lib-tests.el cl-macs.el and 42 other files
@@ -439,9 +439,9 @@ Bartosz Duszel: changed allout.el bib-mode.el cc-cmds.el hexl.el icon.el
   sendmail.el ses.el simple.el verilog-mode.el vi.el vip.el viper-cmd.el
   xscheme.el
 
-Basil L. Contovounesios: changed message.el simple.el css-mode-tests.el
+Basil L. Contovounesios: changed simple.el message.el css-mode-tests.el
   css-mode.el customize.texi gnus-art.el json-tests.el json.el man.el
-  shr-color.el
+  shr-color.el text.texi
 
 Bastian Beischer: changed include.el mru-bookmark.el refs.el
   semantic/complete.el senator.el
@@ -560,7 +560,7 @@ and changed fill.el simple.el indent.el paragraphs.el cmds.c intervals.c
   text-mode.el textprop.c ada.el allout.el awk-mode.el bibtex.el buffer.c
   buffer.h c-mode.el and 38 other files
 
-Boris Samorodov: changed net/imap.el
+Boris Samorodov: changed imap.el
 
 Boruch Baum: changed bookmark.el
 
@@ -668,10 +668,10 @@ Changwoo Ryu: changed files.el
 
 Chao-Hong Liu: changed TUTORIAL.cn TUTORIAL.zh
 
-Charles A. Roelli: changed nsterm.m nsfns.m nsterm.h org-clock.el DEBUG
-  INSTALL add-log.el anti.texi buffers.texi comint.el data.c diff-mode.el
-  display.texi eldoc.el files.el fill.el find-func.el flymake.el frame.el
-  internals.texi macfont.m and 13 other files
+Charles A. Roelli: changed nsterm.m display.texi nsfns.m nsterm.h
+  org-clock.el DEBUG INSTALL add-log.el anti.texi buffers.texi comint.el
+  data.c diff-mode.el eldoc.el files.el fill.el find-func.el flymake.el
+  frame.el internals.texi macfont.m and 13 other files
 
 Charles Hannum: changed aix3-1.h aix3-2.h configure ibmrs6000.h
   keyboard.c netbsd.h pop.c sysdep.c systime.h systty.h xrdb.c
@@ -920,11 +920,11 @@ Daniel Engeler: changed sysdep.c elisp.texi emacs.texi internals.texi
 
 Daniel Hackney: wrote package-tests.el
 and co-wrote package.el
-and changed package-x.el ange-ftp.el automated/Makefile.in browse-url.el
-  dbus.el dired-x.el ediff-diff.el ediff-init.el ediff-merg.el
-  ediff-mult.el ediff-util.el ediff-wind.el ediff.el emacsclient.c
-  emerge.el eudc.el eudcb-ldap.el eww.el finder.el imap.el pcvs.el
-  and 5 other files
+and changed package-test.el package-x.el ange-ftp.el
+  automated/Makefile.in browse-url.el dbus.el dired-x.el ediff-diff.el
+  ediff-init.el ediff-merg.el ediff-mult.el ediff-util.el ediff-wind.el
+  ediff.el emacsclient.c emerge.el eudc.el eudcb-ldap.el eww.el finder.el
+  imap.el and 6 other files
 
 Daniel Jensen: changed apropos.el
 
@@ -956,8 +956,8 @@ and changed make-mode.el files.el buff-menu.el font-lock.el mpuz.el
   and 12 other files
 
 Daniel Pittman: co-wrote tramp-cache.el
-and changed gnus-spec.el gnus-sum.el nnimap.el spam-report.el spam.el
-  tramp-sh.el
+and changed gnus-spec.el gnus-sum.el ispell.el nnimap.el spam-report.el
+  spam.el tramp-sh.el
 
 Daniel Quinlan: changed dired.el info.el
 
@@ -1005,7 +1005,7 @@ and co-wrote latin-ltx.el socks.el
 and changed configure.ac help.el mule-cmds.el fortran.el mule-conf.el
   xterm.c browse-url.el mule.el coding.c src/Makefile.in european.el
   fns.c mule-diag.el simple.el wid-edit.el cus-edit.el cus-start.el
-  files.el keyboard.c byte-opt.el info.el and 775 other files
+  files.el keyboard.c byte-opt.el info.el and 773 other files
 
 Dave Pearson: wrote 5x5.el quickurl.el
 
@@ -1039,8 +1039,8 @@ David De La Harpe Golden: changed files.el mouse.el simple.el fileio.c
   cus-start.el nsselect.m select.el w32-fns.el x-win.el xterm.c
 
 David Edmondson: changed message.el erc.el mml2015.el process.c
-  gnus-cite.el mm-uu.el mm-view.el net/imap.el nnfolder.el nnimap.el
-  nnml.el shr.el
+  gnus-cite.el imap.el mm-uu.el mm-view.el nnfolder.el nnimap.el nnml.el
+  shr.el
 
 David Engster: wrote mairix.el nnmairix.el
 and co-wrote gitmerge.el
@@ -1194,7 +1194,7 @@ Dennis Gilmore: changed sparc.h
 
 Denys Duchier: changed pop3.el
 
-Derek Atkins: changed net/imap.el pgg-pgp.el
+Derek Atkins: changed imap.el pgg-pgp.el
 
 Derek L. Davies: changed gud.el
 
@@ -1259,9 +1259,9 @@ Dmitry Gutov: wrote elisp-mode-tests.el jit-lock-tests.el json-tests.el
   vc-hg-tests.el xref-tests.el
 and changed ruby-mode.el xref.el vc-git.el elisp-mode.el etags.el
   ruby-mode-tests.el project.el js.el package.el vc-hg.el vc.el
-  symref/grep.el package-tests.el log-edit.el menu-bar.el
+  symref/grep.el log-edit.el menu-bar.el package-test.el
   progmodes/grep.el simple.el vc-svn.el eldoc.el find-func.el lisp.el
-  and 88 other files
+  and 89 other files
 
 Dmitry Kurochkin: changed isearch.el
 
@@ -1294,7 +1294,7 @@ and changed cus-edit.el dired.el faces.el files.el help-mode.el imenu.el
 
 E. Choroba: changed simple.el
 
-Ed L. Cashin: changed gnus-sum.el net/imap.el
+Ed L. Cashin: changed gnus-sum.el imap.el
 
 Ed Swarthout: changed hexl.el textmodes/table.el
 
@@ -1344,8 +1344,8 @@ Eli Zaretskii: wrote [bidirectional display in xdisp.c]
   tty-colors.el
 and changed xdisp.c msdos.c w32.c display.texi w32fns.c simple.el
   files.el fileio.c w32proc.c keyboard.c w32term.c files.texi text.texi
-  dispnew.c emacs.c lisp.h dispextern.h frames.texi process.c term.c
-  window.c and 1110 other files
+  dispnew.c emacs.c frames.texi lisp.h dispextern.h process.c term.c
+  window.c and 1111 other files
 
 Emanuele Giaquinta: changed configure.ac rxvt.el charset.c etags.c
   fontset.c frame.el gnus-faq.texi loadup.el lread.c sh-script.el
@@ -1661,8 +1661,7 @@ Gary Oberbrunner: changed gud.el
 
 Gary Wong: changed termcap.c tparam.c
 
-Gaute B Strokkenes: changed net/imap.el gnus-fun.el mail-source.el
-  process.c
+Gaute B Strokkenes: changed imap.el gnus-fun.el mail-source.el process.c
 
 G Dinesh Dutt: changed etags.el
 
@@ -1730,7 +1729,7 @@ and changed configure.ac Makefile.in src/Makefile.in calendar.el
   diary-lib.el lisp/Makefile.in files.el rmail.el make-dist
   progmodes/f90.el bytecomp.el simple.el authors.el emacs.texi
   misc/Makefile.in admin.el startup.el lib-src/Makefile.in ack.texi
-  display.texi cal-menu.el and 1678 other files
+  display.texi cal-menu.el and 1675 other files
 
 Glynn Clements: wrote gamegrid.el snake.el tetris.el
 
@@ -1963,8 +1962,7 @@ Istvan Marko: changed gnus-agent.el xfns.c
 Itai Zukerman: changed mm-decode.el
 
 Ivan Andrus: changed epg.el ffap.el find-file.el ibuf-ext.el ibuffer.el
-  newcomment.el nextstep/templates/Info.plist.in nxml-mode.el
-  progmodes/python.el
+  newcomment.el nxml-mode.el progmodes/python.el
 
 Ivan Boldyrev: changed mml1991.el
 
@@ -2103,7 +2101,7 @@ Jason Dunsmore: changed org.el ox-html.el
 
 Jason L. Wright: changed smtpmail.el
 
-Jason Merrill: changed gnus-sum.el add-log.el gnus-salt.el net/imap.el
+Jason Merrill: changed gnus-sum.el add-log.el gnus-salt.el imap.el
   nnfolder.el
 
 Jason Riedy: changed org-table.el org.texi
@@ -2445,7 +2443,7 @@ Jorge A. Alfaro-Murillo: changed message.el
 Jorgen Schäfer: wrote erc-autoaway.el erc-goodies.el erc-spelling.el
 and changed erc.el erc-track.el erc-backend.el erc-match.el misc.el
   erc-stamp.el erc-button.el erc-fill.el erc-members.el erc-truncate.el
-  erc-compat.el package-tests.el progmodes/python.el Makefile erc-dcc.el
+  erc-compat.el package-test.el progmodes/python.el Makefile erc-dcc.el
   erc-ibuffer.el erc-macs.el erc-page.el erc-pcomplete.el erc-sound.el
   minibuffer.el and 15 other files
 
@@ -2495,7 +2493,7 @@ and changed subr.el desktop.el w32fns.c server.el emacsclient.c simple.el
 Juan Pechiar: wrote ob-mscgen.el
 and changed ob-octave.el
 
-Juergen Kreileder: changed net/imap.el nnimap.el
+Juergen Kreileder: changed imap.el nnimap.el
 
 Juergen Nickelsen: wrote ws-mode.el
 
@@ -2557,7 +2555,7 @@ and co-wrote longlines.el tramp-sh.el tramp.el
 and changed message.el gnus-agent.el gnus-sum.el files.el nnmail.el
   tramp.texi nntp.el gnus.el simple.el ange-ftp.el dired.el paragraphs.el
   bindings.el files.texi gnus-art.el gnus-group.el man.el INSTALL
-  Makefile.in crisp.el fileio.c and 43 other files
+  Makefile.in crisp.el fileio.c and 44 other files
 
 Kailash C. Chowksey: changed HELLO ind-util.el kannada.el knd-util.el
   lisp/Makefile.in loadup.el
@@ -2599,7 +2597,7 @@ and changed simple.el files.el doc-view.el image-mode.el info.el
 Karl Heuer: changed keyboard.c lisp.h xdisp.c buffer.c xfns.c xterm.c
   alloc.c files.el frame.c configure.ac window.c data.c minibuf.c
   editfns.c fns.c process.c Makefile.in fileio.c simple.el keymap.c
-  indent.c and 445 other files
+  indent.c and 446 other files
 
 Karl Kleinpaste: changed gnus-sum.el gnus-art.el gnus-picon.el
   gnus-score.el gnus-uu.el gnus-xmas.el gnus.el mm-uu.el mml.el nnmail.el
@@ -2609,6 +2607,8 @@ Karl Landstrom: co-wrote js.el
 
 Karl M. Hegbloom: changed gnus.el
 
+Karl Otness: changed term.el
+
 Karl Pflästerer: changed gnus-art.el gnus-score.el mml.el spam-stat.el
   vc-svn.el
 
@@ -2625,7 +2625,7 @@ Katsumi Yamaoka: wrote canlock.el
 and changed gnus-art.el gnus-sum.el message.el mm-decode.el gnus.texi
   mm-util.el mm-view.el gnus-util.el gnus-group.el gnus-msg.el shr.el
   mml.el rfc2047.el gnus-start.el gnus.el nntp.el gnus-agent.el nnrss.el
-  mm-uu.el nnmail.el emacs-mime.texi and 164 other files
+  mm-uu.el nnmail.el emacs-mime.texi and 160 other files
 
 Kaushal Modi: changed files.el isearch.el apropos.el calc-yank.el
   desktop.el ediff-diff.el eww.el ffap.el maintaining.texi printing.el
@@ -2637,7 +2637,7 @@ Kaveh R. Ghazi: changed delta88k.h xterm.c
 
 Kayvan Sylvan: changed supercite.el
 
-Kazuhiro Ito: changed coding.c font.c keyboard.c mail/flow-fill.el
+Kazuhiro Ito: changed coding.c flow-fill.el font.c keyboard.c
   make-mode.el net/starttls.el xdisp.c
 
 Kazushi Marukawa: changed filelock.c hexl.c profile.c unexalpha.c
@@ -2752,7 +2752,7 @@ and changed xdisp.c dispextern.h process.c simple.el window.c keyboard.c
 Kimit Yada: changed copyright.el
 
 Kim-Minh Kaplan: changed gnus-picon.el gnus-sum.el gnus-start.el
-  gnus-win.el gnus-xmas.el gnus.texi message.el net/imap.el nndraft.el
+  gnus-win.el gnus-xmas.el gnus.texi imap.el message.el nndraft.el
   nnml.el
 
 Kirill A. Korinskiy: changed fortune.el
@@ -2859,7 +2859,7 @@ and co-wrote gnus-kill.el gnus-mh.el gnus-msg.el gnus-score.el
 and changed gnus.texi process.c gnus-ems.el subr.el gnutls.c gnus-cite.el
   pop3.el smtpmail.el display.texi files.el url-http.el gnus-xmas.el
   simple.el auth-source.el image.c proto-stream.el gnutls.el dired.el
-  image.el text.texi nnrss.el and 322 other files
+  image.el text.texi nnrss.el and 318 other files
 
 Lars Rasmusson: changed ebrowse.c
 
@@ -3084,7 +3084,7 @@ and changed image-dired.el dunnet.el mpc.el eww.el json.el calc-units.el
 
 Mark Plaksin: changed nnrss.el term.el
 
-Mark Thomas: changed gnus-sum.el gnus-util.el mail/flow-fill.el nnmail.el
+Mark Thomas: changed flow-fill.el gnus-sum.el gnus-util.el nnmail.el
 
 Mark Triggs: changed nnir.el
 
@@ -3193,8 +3193,7 @@ Mathias Megyei: changed lisp/Makefile.in
 
 Mats Lidell: changed TUTORIAL.sv european.el gnus-art.el org-element.el
 
-Matt Armstrong: changed gnus-topic.el gnus.el message.el net/imap.el
-  shell.el
+Matt Armstrong: changed gnus-topic.el gnus.el imap.el message.el shell.el
 
 Matt Curtis: changed pulse.el
 
@@ -3268,7 +3267,7 @@ and changed tramp.texi tramp-adb.el trampver.el trampver.texi dbusbind.c
   file-notify-tests.el ange-ftp.el files.el dbus.texi files.texi
   autorevert.el tramp-fish.el kqueue.c tramp-gw.el tramp-imap.el os.texi
   configure.ac lisp.h gfilenotify.c inotify.c keyboard.c
-  and 216 other files
+  and 217 other files
 
 Michael Ben-Gershon: changed acorn.h configure.ac riscix1-1.h riscix1-2.h
   unexec.c
@@ -3486,7 +3485,7 @@ Myles English: changed org-clock.el
 Nachum Dershowitz: co-wrote cal-hebrew.el
 
 Nagy Andras: co-wrote gnus-sieve.el
-and changed net/imap.el gnus.el
+and changed imap.el gnus.el
 
 Nakagawa Makoto: changed ldap.el
 
@@ -3619,9 +3618,9 @@ Noah Lavine: changed tramp.el
 
 Noam Postavsky: changed progmodes/python.el lisp-mode.el xdisp.c
   cl-macs.el emacs-lisp/debug.el data.c ert.el lisp-mode-tests.el
-  simple.el help-fns.el subr.el bytecomp.el elisp-mode.el eval.c ffap.el
-  modes.texi sh-script.el term.el cl-preloaded.el cl-print.el org-src.el
-  and 220 other files
+  simple.el help-fns.el subr.el term.el bytecomp.el elisp-mode.el eval.c
+  ffap.el modes.texi search.c sh-script.el cl-preloaded.el cl-print.el
+  and 223 other files
 
 Nobuyoshi Nakada: co-wrote ruby-mode.el
 
@@ -3639,7 +3638,7 @@ Nozomu Ando: changed unexmacosx.c alloc.c buffer.c mips.h pmax.h
 
 N. Raghavendra: changed timezone.el
 
-Nuutti Kotivuori: changed gnus-sum.el gnus-cache.el mail/flow-fill.el
+Nuutti Kotivuori: changed gnus-sum.el flow-fill.el gnus-cache.el
 
 Odd Gripenstam: wrote dcl-mode.el
 
@@ -3910,7 +3909,7 @@ and changed lisp/Makefile.in undo.c simple.el test/Makefile.in Makefile
   Makefile.in viper-cmd.el elisp-mode-tests.el keyboard.c ldefs-clean.el
   loadup.el autoload.el automated/Makefile.in build-zips.sh cmds.c
   dired.el eieio-tests.el fileio.c htmlfontify.el
-  make-test-deps.emacs-lisp package-tests.el and 167 other files
+  make-test-deps.emacs-lisp reftex-tests.el and 168 other files
 
 Phil Sainty: changed derived.el easy-mmode.el lisp.el package.el
   progmodes/grep.el simple.el subword.el term.el
@@ -3978,7 +3977,7 @@ Ralf Angeli: wrote scroll-lock.el
 and changed w32fns.c reftex-cite.el gnus-art.el reftex-toc.el reftex.el
   reftex-auc.el reftex-dcr.el reftex-global.el reftex-index.el
   reftex-parse.el reftex-ref.el reftex-sel.el reftex-vars.el reftex.texi
-  tex-mode.el comint.el frame.el killing.texi mail/flow-fill.el mm-uu.el
+  tex-mode.el comint.el flow-fill.el frame.el killing.texi mm-uu.el
   mm-view.el and 6 other files
 
 Ralf Fassel: changed dabbrev.el files.el fill.el iso-acc.el tar-mode.el
@@ -4019,7 +4018,7 @@ Reiner Steib: wrote gmm-utils.el gnus-news.el
 and changed message.el gnus.texi gnus-art.el gnus-sum.el gnus-group.el
   gnus.el mml.el gnus-faq.texi mm-util.el gnus-score.el message.texi
   gnus-msg.el gnus-start.el gnus-util.el spam-report.el mm-uu.el spam.el
-  mm-decode.el files.el gnus-agent.el nnmail.el and 175 other files
+  mm-decode.el files.el gnus-agent.el nnmail.el and 174 other files
 
 Remek Trzaska: changed gnus-ems.el
 
@@ -4127,10 +4126,9 @@ Roberto Rodríguez: changed ada-mode.texi glossary.texi widget.texi
 Robert P. Goldman: changed org.texi ob-exp.el org.el ox-latex.el
 
 Robert Pluim: changed gtkutil.c misc.texi vc-git.el xfns.c xterm.c
-  configure.ac desktop.el dired-x.texi epa.texi gnus-agent.el
-  gnus-demon.el gnus.texi ido.el minibuf.c minibuf.texi org-agenda.el
-  process.c progmodes/grep.el project.el text.texi todo-mode.el
-  and 4 other files
+  bindings.el configure.ac desktop.el dired-x.texi epa.texi gnus-agent.el
+  gnus-demon.el gnus.texi ido.el image-mode.el minibuf.c minibuf.texi
+  org-agenda.el process.c progmodes/grep.el project.el and 8 other files
 
 Robert Thorpe: changed cus-start.el indent.el
 
@@ -4340,9 +4338,8 @@ Sébastien Vauban: changed org.el org-agenda.el ox-latex.el ob-core.el
   org-clock.el ox-ascii.el ox-html.el
 
 Seiji Zenitani: changed nsfns.m frame.c xterm.c PkgInfo document.icns
-  find-func.el frame.h help-fns.el macfns.c
-  nextstep/templates/Info.plist.in nsfont.m nsterm.m w32fns.c xdisp.c
-  xfns.c
+  find-func.el frame.h help-fns.el macfns.c nsfont.m nsterm.m w32fns.c
+  xdisp.c xfns.c
 
 Sen Nagata: wrote crm.el rfc2368.el
 
@@ -4381,7 +4378,7 @@ and changed gnus-art.el message.el gnus-sum.el gnus-msg.el gnus.el
   gnus-agent.el mm-decode.el mm-util.el gnus-group.el mml.el
   gnus-start.el gnus-util.el mm-view.el nnslashdot.el nnmail.el nntp.el
   gnus-topic.el gnus-xmas.el rfc2047.el mail-source.el gnus-win.el
-  and 95 other files
+  and 93 other files
 
 Shigeru Fukaya: wrote bytecomp-tests.el
 and changed apropos.el byte-opt.el bytecomp.el elint.el rx-new.el ses.el
@@ -4417,11 +4414,11 @@ Simon Josefsson: wrote dig.el dns-mode.el flow-fill.el fringe.el imap.el
   sieve.el smime.el starttls.el tls.el url-imap.el
 and co-wrote gnus-sieve.el gssapi.el mml1991.el nnfolder.el nnimap.el
   nnml.el sieve-manage.el
-and changed message.el gnus-sum.el net/imap.el gnus-art.el smtpmail.el
-  pgg-gpg.el pgg.el gnus-agent.el mml2015.el mml.el gnus-group.el
-  mm-decode.el gnus-msg.el gnus.texi mail/sieve-manage.el pgg-pgp5.el
-  browse-url.el gnus-int.el gnus.el hashcash.el mail/flow-fill.el
-  and 104 other files
+and changed message.el gnus-sum.el gnus-art.el smtpmail.el pgg-gpg.el
+  pgg.el gnus-agent.el mml2015.el mml.el gnus-group.el mm-decode.el
+  gnus-msg.el gnus.texi mail/sieve-manage.el pgg-pgp5.el browse-url.el
+  gnus-int.el gnus.el hashcash.el mm-view.el password.el
+  and 102 other files
 
 Simon Law: changed delsel.el electric.el
 
@@ -4475,7 +4472,7 @@ and co-wrote font-lock.el gitmerge.el pcvs.el
 and changed subr.el simple.el keyboard.c lisp.h bytecomp.el files.el
   vc.el cl-macs.el xdisp.c alloc.c eval.c sh-script.el
   progmodes/compile.el keymap.c tex-mode.el newcomment.el window.c
-  buffer.c lisp-mode.el lread.c vc-hooks.el and 1281 other files
+  buffer.c lisp-mode.el lread.c vc-hooks.el and 1280 other files
 
 Stefano Facchini: changed gtkutil.c
 
@@ -4491,7 +4488,7 @@ Stefan-W. Hahn: changed org-bibtex.el ps-print.el simple.el subr.el
 
 Stefan Wiens: changed gnus-sum.el
 
-Steinar Bang: changed gnus-setup.el net/imap.el
+Steinar Bang: changed gnus-setup.el imap.el
 
 Štěpán Němec: changed INSTALL calc-ext.el cl.texi comint.el edebug.texi
   font-lock.el loading.texi maps.texi mark.texi message.texi mini.texi
@@ -4889,8 +4886,6 @@ Toru Tsuneyoshi: changed ange-ftp.el buff-menu.el cus-start.el fileio.c
 
 Toshiaki Nomura: changed uxpds.h
 
-Travis Jeffery: changed nextstep/templates/Info.plist.in
-
 Trent W. Buck: changed rcirc.el remember.el rx.el
 
 Trevor Murphy: changed gnus.texi nnimap.el org.el
@@ -5132,6 +5127,8 @@ Xavier Maillard: changed gnus-faq.texi gnus-score.el mh-utils.el spam.el
 
 Xi Lu: changed etags.c tramp-sh.el
 
+Xu Chunyang: changed gud.el
+
 Xue Fuqiao: changed display.texi emacs-lisp-intro.texi files.texi
   maintaining.texi text.texi windows.texi nonascii.texi frames.texi
   os.texi vc-cvs.el vc-dir.el README emacs.texi ido.texi positions.texi
diff --git a/etc/HISTORY b/etc/HISTORY
index 095e6cb9142..ba86182a1c3 100644
--- a/etc/HISTORY
+++ b/etc/HISTORY
@@ -213,6 +213,8 @@ GNU Emacs 25.2 (2017-04-20) emacs-25.2
 
 GNU Emacs 25.3 (2017-09-11) emacs-25.3
 
+GNU Emacs 26.1 (2018-05-28) emacs-26.1
+
 
 ----------------------------------------------------------------------
 This file is part of GNU Emacs.
diff --git a/lisp/help.el b/lisp/help.el
index 844087a72f3..985d9c567a7 100644
--- a/lisp/help.el
+++ b/lisp/help.el
@@ -1328,8 +1328,8 @@ This construct is like `with-temp-buffer-window' but unlike that
 puts the buffer specified by BUFFER-OR-NAME in `help-mode' and
 displays a message about how to delete the help window when it's no
 longer needed.  The help window will be selected if
-`help-window-select' is non-nil.  See `help-window-setup' for
-more options."
+`help-window-select' is non-nil.
+Most of this  is done by `help-window-setup', which see."
   (declare (indent 1) (debug t))
   `(progn
      ;; Make `help-window-point-marker' point nowhere.  The only place
diff --git a/lisp/textmodes/bibtex.el b/lisp/textmodes/bibtex.el
index 89c94eb7e90..0111d48ba77 100644
--- a/lisp/textmodes/bibtex.el
+++ b/lisp/textmodes/bibtex.el
@@ -4107,10 +4107,10 @@ A prefix arg negates the value of `bibtex-search-entry-globally'."
                     (setq buffer (pop buffer-list)))
           (with-current-buffer buffer
             (if (cdr (assoc-string key bibtex-reference-keys))
-                ;; `bibtex-search-entry' moves point if key found
                 (setq found (bibtex-search-entry key)))))
         (cond ((and found display)
 	       (switch-to-buffer buffer)
+               (goto-char found)
 	       (bibtex-reposition-window))
               (found (set-buffer buffer))
               (display (message "Key `%s' not found" key)))
diff --git a/src/search.c b/src/search.c
index 842e9309a2e..6d010466dcd 100644
--- a/src/search.c
+++ b/src/search.c
@@ -2233,8 +2233,11 @@ DEFUN ("re-search-backward", Fre_search_backward, Sre_search_backward, 1, 4,
 This function is almost identical to `re-search-forward', except that
 by default it searches backward instead of forward, and the sign of
 COUNT also indicates exactly the opposite searching direction.
+See `re-search-forward' for details.
 
-See `re-search-forward' for details.  */)
+Note that searching backwards may give a shorter match than expected,
+because REGEXP is still matched in the forward direction.  See Info
+anchor `(elisp) re-search-backward' for details.  */)
   (Lisp_Object regexp, Lisp_Object bound, Lisp_Object noerror, Lisp_Object count)
 {
   return search_command (regexp, bound, noerror, count, -1, 1, 0);