Merge from origin/emacs-26

a89f0b6f33 maint: shorten https://lists.gnu.org/archive/html/... links
8be3aee281 Merge from Gnulib
265cee553f Work around GCC bug 80776 on Fedora 27 x86
dc7a97fb84 Tweak copy-file, rename-file doc
cfa2a944d4 Change font-lock-extend-region-multiline handling in mhtml...
a8664cc998 Minor cleanup in tramp-gvfs-handle-file-local-copy
55c5b12fa0 Add test for Bug#29423 in Tramp.
3198a1646e Avoid jumbled order in HTML rendered by shr.el
23bfc2d2db Make sure 'dired-filename' property is always put by ls-lisp
f7fdaea4c0 A better solution for bug#29347
86e6ed8521 ; * src/thread.c (acquire_global_lock): Fix thinko in last...
f300852037 Avoid a hang after C-g while sit-for on a Unix TTY
d7fc719ff1 Improve the doc string of 'list-packages'
b4f67ebb92 Improve discoverability of 'defvar' for suppressing warnings
8a2b204e64 Improve discoverability of 'read-buffer-completion-ignore-...
eea4e9194c Improve documentation of self-insert-uses-region-functions
e6e41dac87 Reflect changes in copy-file and rename-file in doc strings
0ec534070f * lisp/progmodes/cc-vars.el (c-offsets-alist): Doc fix.  (...
1d0dbdff6c Reorder type predicates in ELisp manual
b081ec9dd7 Fix backward scrolling in buffers with header-line
8e40429c96 ; Fix some doc typos
ed2c542920 * lisp/bindings.el (buffer-file-coding-system): Add explic...
d82474e452 * src/fns.c (syms_of_fns) <overriding-plist-environment>: ...
292c09ff6d Fix incorrect interaction of drag/drop and double click (b...
d6fadb1d26 * lisp/menu-bar.el (menu-bar-options-save): Add display-li...
daa959efbc * lisp/menu-bar.el (menu-bar-options-save): Add global-dis...
17fc74d1b9 * lisp/follow.el (follow-mode): Restore mode line lighter....
f20c2e2f3d ; Compare process status against 127 exactly
2d203ffb7e Extract the common part of ruby-flymake-simple and ruby-fl...
09944d499a Add Rubocop Flymake backend
c65a0ae7c4 ; Fix a typo
7ab7603125 Update nt/INSTALL.W64 (Bug#28601)
11db253c08 Remove incorrect NEWS item about VC state indicator (Bug#2...
2fdc01c036 * lisp/emacs-lisp/byte-run.el (defsubst): Doc fix.
735c8b516e Make c-defun-name analyze more thoroughly a function type ...
92f0c4cd56 Avoid bogus abbreviated file names if HOME changes
8d450453fa * lisp/emacs-lisp/byte-run.el (inline): Give it a doc.
37a3b4ea40 Fix erc keep-place module with new defaults (Bug#29111)
6c312605bf Add window divider faces to NS (bug#29353)

# Conflicts:
#	etc/NEWS
#	lisp/ruler-mode.el

18 files changed, 80 insertions, 64 deletions

diff --git a/doc/emacs/Makefile.in b/doc/emacs/Makefile.in
index f7cc2e112c3..61e870b80fb 100644
--- a/doc/emacs/Makefile.in
+++ b/doc/emacs/Makefile.in
@@ -58,7 +58,7 @@ HTML_OPTS = --no-split --html
 # Options used only when making info output.
 # --no-split is only needed because of MS-DOS.
 # For a possible alternative, see
-# https://lists.gnu.org/archive/html/emacs-devel/2011-01/msg01182.html
+# https://lists.gnu.org/r/emacs-devel/2011-01/msg01182.html
 INFO_OPTS= --no-split
 
 INSTALL = @INSTALL@
diff --git a/doc/emacs/buffers.texi b/doc/emacs/buffers.texi
index a8b810ef91f..362d3b36453 100644
--- a/doc/emacs/buffers.texi
+++ b/doc/emacs/buffers.texi
@@ -98,7 +98,8 @@ related commands, use @dfn{permissive completion with confirmation} for
 minibuffer completion: if you type @key{RET} immediately after
 completing up to a nonexistent buffer name, Emacs prints
 @samp{[Confirm]} and you must type a second @key{RET} to submit that
-buffer name.  @xref{Completion Exit}, for details.
+buffer name.  @xref{Completion Exit}, for details.  For other
+completion options and features, see @ref{Completion Options}.
 
   If you specify a buffer that does not exist, @kbd{C-x b} creates a
 new, empty buffer that is not visiting any file, and selects it for
diff --git a/doc/emacs/emacs.texi b/doc/emacs/emacs.texi
index 2559b0646c0..2c3312d7a83 100644
--- a/doc/emacs/emacs.texi
+++ b/doc/emacs/emacs.texi
@@ -1503,7 +1503,7 @@ Neal Ziring, Teodor Zlatanov, and Detlev Zundel.
 advanced, self-documenting, customizable, extensible editor Emacs.
 (The @samp{G} in
 @c Workaround makeinfo 4 bug.
-@c https://lists.gnu.org/archive/html/bug-texinfo/2004-08/msg00009.html
+@c https://lists.gnu.org/r/bug-texinfo/2004-08/msg00009.html
 @iftex
 @acronym{GNU, @acronym{GNU}'s Not Unix}
 @end iftex
diff --git a/doc/emacs/frames.texi b/doc/emacs/frames.texi
index 8c08f51825c..c94d690cf7f 100644
--- a/doc/emacs/frames.texi
+++ b/doc/emacs/frames.texi
@@ -1020,7 +1020,7 @@ Manual}.
 @cindex Horizontal Scroll Bar mode
   On graphical displays with toolkit support, Emacs may also supply a
 @dfn{horizontal scroll bar} on the bottom of each window.  Clicking
-@kbd{mouse-1} on the that scroll bar's left and right buttons scrolls
+@kbd{mouse-1} on that scroll bar's left and right buttons scrolls
 the window horizontally by one column at a time.  Clicking @kbd{mouse-1}
 on the left or right of the scroll bar's inner box scrolls the window by
 four columns.  Dragging the inner box scrolls the window continuously.
diff --git a/doc/emacs/mule.texi b/doc/emacs/mule.texi
index 8a4d91f80bf..9ef31102455 100644
--- a/doc/emacs/mule.texi
+++ b/doc/emacs/mule.texi
@@ -1356,7 +1356,7 @@ fontset}, the @dfn{startup fontset} and the @dfn{default fontset}.
 @c FIXME?  The doc of *standard*-fontset-spec says:
 @c "You have the biggest chance to display international characters
 @c with correct glyphs by using the *standard* fontset." (my emphasis)
-@c See https://lists.gnu.org/archive/html/emacs-devel/2012-04/msg00430.html
+@c See https://lists.gnu.org/r/emacs-devel/2012-04/msg00430.html
 The default fontset is most likely to have fonts for a wide variety of
 non-@acronym{ASCII} characters, and is the default fallback for the
 other two fontsets, and if you set a default font rather than fontset.
diff --git a/doc/emacs/trouble.texi b/doc/emacs/trouble.texi
index d0b3419a991..4a836c3224b 100644
--- a/doc/emacs/trouble.texi
+++ b/doc/emacs/trouble.texi
@@ -524,7 +524,7 @@ The @samp{emacs-pretest-bug} mailing list.  This list is no longer
 used, and is mainly of historical interest.  At one time, it was used
 for bug reports in development (i.e., not yet released) versions of
 Emacs.  You can read the archives for 2003 to mid 2007 at
-@url{https://lists.gnu.org/archive/html/emacs-pretest-bug/}.  Nowadays,
+@url{https://lists.gnu.org/r/emacs-pretest-bug/}.  Nowadays,
 it is an alias for @samp{bug-gnu-emacs}.
 
 @item
diff --git a/doc/lispref/ChangeLog.1 b/doc/lispref/ChangeLog.1
index 3fab757c963..c461f9a42b1 100644
--- a/doc/lispref/ChangeLog.1
+++ b/doc/lispref/ChangeLog.1
@@ -497,7 +497,7 @@
         Improve doc for use of 'int', and discuss 'ssize_t'.
         * internals.texi (C Integer Types): Mention 'int' for other
         randomish values that lie in 'int' range.  Mention 'ssize_t'.  See:
-        https://lists.gnu.org/archive/html/emacs-devel/2014-10/msg00019.html
+        https://lists.gnu.org/r/emacs-devel/2014-10/msg00019.html
 
         Use AUTO_CONS instead of SCOPED_CONS, etc.
         * internals.texi (Stack-allocated Objects):
@@ -2154,7 +2154,7 @@
 
         * internals.texi (C Integer Types): New section.
         This follows up and records an email in
-        <https://lists.gnu.org/archive/html/emacs-devel/2012-07/msg00496.html>.
+        <https://lists.gnu.org/r/emacs-devel/2012-07/msg00496.html>.
 
 2012-12-10  Stefan Monnier  <monnier@iro.umontreal.ca>
 
@@ -6288,7 +6288,7 @@
 2009-04-11  Eli Zaretskii  <eliz@gnu.org>
 
         * display.texi (Overlays): Overlays don't scale well.  See
-        https://lists.gnu.org/archive/html/emacs-devel/2009-04/msg00243.html.
+        https://lists.gnu.org/r/emacs-devel/2009-04/msg00243.html.
 
 2009-04-10  Chong Yidong  <cyd@stupidchicken.com>
 
diff --git a/doc/lispref/compile.texi b/doc/lispref/compile.texi
index 201d9fc2fa5..57ff06085d9 100644
--- a/doc/lispref/compile.texi
+++ b/doc/lispref/compile.texi
@@ -434,6 +434,7 @@ to what @code{eval-when-compile} does.
 @node Compiler Errors
 @section Compiler Errors
 @cindex compiler errors
+@cindex byte-compiler errors
 
   Error and warning messages from byte compilation are printed in a
 buffer named @file{*Compile-Log*}.  These messages include file names
@@ -450,6 +451,10 @@ compiled, and point shows how far the byte compiler was able to read;
 the cause of the error might be nearby.  @xref{Syntax Errors}, for
 some tips for locating syntax errors.
 
+@cindex byte-compiler warnings
+@cindex free variable, byte-compiler warning
+@cindex reference to free variable, compilation warning
+@cindex function not known to be defined, compilation warning
   A common type of warning issued by the byte compiler is for
 functions and variables that were used but not defined.  Such warnings
 report the line number for the end of the file, not the locations
@@ -490,12 +495,13 @@ The reference to @var{variable} must be in the @var{then-form} of the
 
 @item
 You can tell the compiler that a function is defined using
-@code{declare-function}. @xref{Declaring Functions}.
+@code{declare-function}.  @xref{Declaring Functions}.
 
 @item
 Likewise, you can tell the compiler that a variable is defined using
 @code{defvar} with no initial value.  (Note that this marks the
-variable as special.)  @xref{Defining Variables}.
+variable as special, i.e.@: dynamically bound.)  @xref{Defining
+Variables}.
 @end itemize
 
   You can also suppress any and all compiler warnings within a certain
diff --git a/doc/lispref/modes.texi b/doc/lispref/modes.texi
index f7013da9433..bd94aeadf15 100644
--- a/doc/lispref/modes.texi
+++ b/doc/lispref/modes.texi
@@ -1490,10 +1490,11 @@ alist @code{minor-mode-map-alist}.  @xref{Definition of minor-mode-map-alist}.
   One use of minor mode keymaps is to modify the behavior of certain
 self-inserting characters so that they do something else as well as
 self-insert.  (Another way to customize @code{self-insert-command} is
-through @code{post-self-insert-hook}.  Apart from this, the facilities
-for customizing @code{self-insert-command} are limited to special cases,
-designed for abbrevs and Auto Fill mode.  Do not try substituting your
-own definition of @code{self-insert-command} for the standard one.  The
+through @code{post-self-insert-hook}, see @ref{Commands for
+Insertion}.  Apart from this, the facilities for customizing
+@code{self-insert-command} are limited to special cases, designed for
+abbrevs and Auto Fill mode.  Do not try substituting your own
+definition of @code{self-insert-command} for the standard one.  The
 editor command loop handles this function specially.)
 
 Minor modes may bind commands to key sequences consisting of @kbd{C-c}
diff --git a/doc/lispref/objects.texi b/doc/lispref/objects.texi
index daa397175c3..97f411a08dc 100644
--- a/doc/lispref/objects.texi
+++ b/doc/lispref/objects.texi
@@ -1898,6 +1898,9 @@ with references to further information.
 @item bool-vector-p
 @xref{Bool-Vectors, bool-vector-p}.
 
+@item booleanp
+@xref{nil and t, booleanp}.
+
 @item bufferp
 @xref{Buffer Basics, bufferp}.
 
@@ -1967,18 +1970,15 @@ with references to further information.
 @item mutexp
 @xref{Mutexes, mutexp}.
 
-@item wholenump
-@xref{Predicates on Numbers, wholenump}.
-
 @item nlistp
 @xref{List-related Predicates, nlistp}.
 
-@item numberp
-@xref{Predicates on Numbers, numberp}.
-
 @item number-or-marker-p
 @xref{Predicates on Markers, number-or-marker-p}.
 
+@item numberp
+@xref{Predicates on Numbers, numberp}.
+
 @item overlayp
 @xref{Overlays, overlayp}.
 
@@ -1991,6 +1991,9 @@ with references to further information.
 @item sequencep
 @xref{Sequence Functions, sequencep}.
 
+@item string-or-null-p
+@xref{Predicates for Strings, string-or-null-p}.
+
 @item stringp
 @xref{Predicates for Strings, stringp}.
 
@@ -2009,6 +2012,9 @@ with references to further information.
 @item vectorp
 @xref{Vectors, vectorp}.
 
+@item wholenump
+@xref{Predicates on Numbers, wholenump}.
+
 @item window-configuration-p
 @xref{Window Configurations, window-configuration-p}.
 
@@ -2017,21 +2023,6 @@ with references to further information.
 
 @item windowp
 @xref{Basic Windows, windowp}.
-
-@item booleanp
-@xref{nil and t, booleanp}.
-
-@item string-or-null-p
-@xref{Predicates for Strings, string-or-null-p}.
-
-@item threadp
-@xref{Basic Thread Functions, threadp}.
-
-@item mutexp
-@xref{Mutexes, mutexp}.
-
-@item condition-variable-p
-@xref{Condition Variables, condition-variable-p}.
 @end table
 
   The most general way to check the type of an object is to call the
diff --git a/doc/lispref/text.texi b/doc/lispref/text.texi
index ab554dcd421..35ba5d0dddc 100644
--- a/doc/lispref/text.texi
+++ b/doc/lispref/text.texi
@@ -525,9 +525,17 @@ responsible for calling @code{blink-paren-function} when the inserted
 character has close parenthesis syntax (@pxref{Blinking}).
 
 @vindex post-self-insert-hook
+@vindex self-insert-uses-region-functions
 The final thing this command does is to run the hook
 @code{post-self-insert-hook}.  You could use this to automatically
-reindent text as it is typed, for example.
+reindent text as it is typed, for example.  If any function on this
+hook needs to act on the region (@pxref{The Region}), it should make
+sure Delete Selection mode (@pxref{Using Region, Delete Selection, ,
+emacs, The GNU Emacs Manual}) doesn't delete the region before
+@code{post-self-insert-hook} functions are invoked.  The way to do so
+is to add a function that returns @code{nil} to
+@code{self-insert-uses-region-functions}, a special hook that tells
+Delete Selection mode it should not delete the region.
 
 Do not try substituting your own definition of
 @code{self-insert-command} for the standard one.  The editor command
diff --git a/doc/lispref/variables.texi b/doc/lispref/variables.texi
index 52d1f3bbf5e..99bbfc91243 100644
--- a/doc/lispref/variables.texi
+++ b/doc/lispref/variables.texi
@@ -435,7 +435,9 @@ dynamically bound value; @pxref{Void Variables}), then @var{value} is
 evaluated and @var{symbol} is set to the result.  But if @var{symbol}
 is not void, @var{value} is not evaluated, and @var{symbol}'s value is
 left unchanged.  If @var{value} is omitted, the value of @var{symbol}
-is not changed in any case.
+is not changed in any case.  Using @code{defvar} with no value is one
+method of suppressing byte compilation warnings, see @ref{Compiler
+Errors}.
 
 If @var{symbol} has a buffer-local binding in the current buffer,
 @code{defvar} acts on the default value, which is buffer-independent,
diff --git a/doc/misc/cl.texi b/doc/misc/cl.texi
index b48278e8b8c..c7ef1d8f5cb 100644
--- a/doc/misc/cl.texi
+++ b/doc/misc/cl.texi
@@ -317,7 +317,7 @@ This is analogous to the @code{defsubst} form;
 @code{cl-defsubst} uses a different method (compiler macros) which
 works in all versions of Emacs, and also generates somewhat more
 @c For some examples,
-@c see https://lists.gnu.org/archive/html/emacs-devel/2012-11/msg00009.html
+@c see https://lists.gnu.org/r/emacs-devel/2012-11/msg00009.html
 efficient inline expansions.  In particular, @code{cl-defsubst}
 arranges for the processing of keyword arguments, default values,
 etc., to be done at compile-time whenever possible.
diff --git a/doc/misc/efaq-w32.texi b/doc/misc/efaq-w32.texi
index eb05e8be438..b66aaeb3198 100644
--- a/doc/misc/efaq-w32.texi
+++ b/doc/misc/efaq-w32.texi
@@ -2286,7 +2286,7 @@ The official mailing list for Windows specific help and discussion is
 @url{https://lists.gnu.org/mailman/listinfo/help-emacs-windows,
 help-emacs-windows}.  See that link for information on how to subscribe
 or unsubscribe.  The
-@uref{https://lists.gnu.org/archive/html/help-emacs-windows/, list archives}
+@uref{https://lists.gnu.org/r/help-emacs-windows/, list archives}
 are available online.
 
 @c ------------------------------------------------------------
diff --git a/doc/misc/efaq.texi b/doc/misc/efaq.texi
index 167aa45c281..df3d09a6337 100644
--- a/doc/misc/efaq.texi
+++ b/doc/misc/efaq.texi
@@ -421,7 +421,7 @@ posting bug reports to this newsgroup directly (@pxref{Reporting bugs}).
 The FSF has maintained archives of all of the GNU mailing lists for many
 years, although there may be some unintentional gaps in coverage.  The
 archive can be browsed over the web at
-@uref{https://lists.gnu.org/archive/html/, the GNU mail archive}.
+@uref{https://lists.gnu.org/r/, the GNU mail archive}.
 
 Web-based Usenet search services, such as
 @uref{http://groups.google.com/groups/dir?q=gnu&, Google}, also
diff --git a/doc/misc/gnus.texi b/doc/misc/gnus.texi
index 169509bae9e..a2a879d5b58 100644
--- a/doc/misc/gnus.texi
+++ b/doc/misc/gnus.texi
@@ -10976,7 +10976,7 @@ Pull all ticked articles (for the current group) into the summary buffer
 @kindex A D (Summary)
 @findex gnus-summary-enter-digest-group
 If the current article is a collection of other articles (for instance,
-a digest), you might use this command to enter a group based on the that
+a digest), you might use this command to enter a group based on that
 article (@code{gnus-summary-enter-digest-group}).  Gnus will try to
 guess what article type is currently displayed unless you give a prefix
 to this command, which forces a ``digest'' interpretation.  Basically,
diff --git a/doc/misc/texinfo.tex b/doc/misc/texinfo.tex
index 022c3f5b370..e2bf51af8c0 100644
--- a/doc/misc/texinfo.tex
+++ b/doc/misc/texinfo.tex
@@ -3,7 +3,7 @@
 % Load plain if necessary, i.e., if running under initex.
 \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
 %
-\def\texinfoversion{2017-09-11.18}
+\def\texinfoversion{2017-11-17.06}
 %
 % Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
 % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
@@ -5969,24 +5969,30 @@ end
     % Split the last of the double-column material.
     \savemarks
     \balancecolumns
-    %
+  }%
+  \eject % call the \output just set
+  \ifdim\pagetotal=0pt
     % Having called \balancecolumns once, we do not
     % want to call it again.  Therefore, reset \output to its normal
     % definition right away.
     \global\output = {\onepageout{\pagecontents\PAGE}}%
-  }%
-  \eject
-  \endgroup % started in \begindoublecolumns
-  \restoremarks
-  % Leave the double-column material on the current page, no automatic
-  % page break.
-  \box\balancedcolumns
-  %
-  % \pagegoal was set to the doubled \vsize above, since we restarted
-  % the current page.  We're now back to normal single-column
-  % typesetting, so reset \pagegoal to the normal \vsize.
-  \global\vsize = \txipageheight %
-  \pagegoal = \txipageheight %
+    %
+    \endgroup % started in \begindoublecolumns
+    \restoremarks
+    % Leave the double-column material on the current page, no automatic
+    % page break.
+    \box\balancedcolumns
+    %
+    % \pagegoal was set to the doubled \vsize above, since we restarted
+    % the current page.  We're now back to normal single-column
+    % typesetting, so reset \pagegoal to the normal \vsize.
+    \global\vsize = \txipageheight %
+    \pagegoal = \txipageheight %
+  \else
+    % We had some left-over material.  This might happen when \doublecolumnout
+    % is called in \balancecolumns.  Try again.
+    \expandafter\enddoublecolumns
+  \fi
 }
 \newbox\balancedcolumns
 \setbox\balancedcolumns=\vbox{shouldnt see this}%
@@ -6001,6 +6007,7 @@ end
   \ifdim\dimen@<5\baselineskip
     % Don't split a short final column in two.
     \setbox2=\vbox{}%
+    \global\setbox\balancedcolumns=\vbox{\pagesofar}%
   \else
     \divide\dimen@ by 2 % target to split to
     \dimen@ii = \dimen@
@@ -6016,15 +6023,15 @@ end
       \repeat
     }%
     % Now the left column is in box 1, and the right column in box 3.
+    %
     % Check whether the left column has come out higher than the page itself.  
     % (Note that we have doubled \vsize for the double columns, so
     % the actual height of the page is 0.5\vsize).
     \ifdim2\ht1>\vsize
-      % Just split the last of the double column material roughly in half.
-      \setbox2=\box0
-      \setbox0 = \vsplit2 to \dimen@ii
-      \setbox0=\vbox to \dimen@ii {\unvbox0\vfill}%
-      \setbox2=\vbox to \dimen@ii {\unvbox2\vfill}%
+      % It appears that we have been called upon to balance too much material.
+      % Output some of it with \doublecolumnout, leaving the rest on the page.
+      \setbox\PAGE=\box0
+      \doublecolumnout
     \else
       % Compare the heights of the two columns.
       \ifdim4\ht1>5\ht3
@@ -6037,10 +6044,10 @@ end
         \setbox2=\vbox to\ht1{\unvbox3\unskip}%
         \setbox0=\vbox to\ht1{\unvbox1\unskip}%
       \fi
+      \global\setbox\balancedcolumns=\vbox{\pagesofar}%
     \fi
   \fi
   %
-  \global\setbox\balancedcolumns=\vbox{\pagesofar}%
 }
 \catcode`\@ = \other
 
diff --git a/doc/misc/tramp.texi b/doc/misc/tramp.texi
index f1d9434bf72..e7d9cb15dee 100644
--- a/doc/misc/tramp.texi
+++ b/doc/misc/tramp.texi
@@ -86,7 +86,7 @@ Savannah Project Page}.
 
 There is a mailing list for @value{tramp}, available at
 @email{tramp-devel@@gnu.org}, and archived at
-@uref{https://lists.gnu.org/archive/html/tramp-devel/, the
+@uref{https://lists.gnu.org/r/tramp-devel/, the
 @value{tramp} Mail Archive}.
 
 @page