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

2 files changed, 65 insertions, 25 deletions

diff --git a/nt/ChangeLog.1 b/nt/ChangeLog.1
index 7502156b1ff..f2d44033d43 100644
--- a/nt/ChangeLog.1
+++ b/nt/ChangeLog.1
@@ -297,8 +297,8 @@
 	to avoid gnulib replacement of 'struct timeval' and the resulting
 	compilation of lib/gettimeofday.c with incompatible version of
 	gettimeofday.  Related discussions on emacs-devel:
-	https://lists.gnu.org/archive/html/emacs-devel/2013-09/msg00286.html
-	https://lists.gnu.org/archive/html/emacs-devel/2013-09/msg00361.html
+	https://lists.gnu.org/r/emacs-devel/2013-09/msg00286.html
+	https://lists.gnu.org/r/emacs-devel/2013-09/msg00361.html
 
 2013-08-31  Glenn Morris  <rgm@gnu.org>
 
@@ -373,7 +373,7 @@
 
 	* inc/sys/time.h (gettimeofday): Use '__restrict' instead of
 	'restrict', which is a C99 extension.  See
-	https://lists.gnu.org/archive/html/emacs-devel/2013-05/msg00588.html
+	https://lists.gnu.org/r/emacs-devel/2013-05/msg00588.html
 	and the following discussion for the problem this caused in the
 	old nt/configure.bat build.
 
@@ -524,10 +524,10 @@
 
 	Fix more incompatibilities between MinGW.org and MinGW64 headers
 	reported by Óscar Fuentes in
-	https://lists.gnu.org/archive/html/emacs-devel/2013-03/msg00733.html
-	https://lists.gnu.org/archive/html/emacs-devel/2013-03/msg00699.html
+	https://lists.gnu.org/r/emacs-devel/2013-03/msg00733.html
+	https://lists.gnu.org/r/emacs-devel/2013-03/msg00699.html
 	and in
-	https://lists.gnu.org/archive/html/emacs-devel/2013-03/msg00707.html.
+	https://lists.gnu.org/r/emacs-devel/2013-03/msg00707.html.
 	* inc/ms-w32.h (USE_NO_MINGW_SETJMP_TWO_ARGS) [_W64]: Define to 1.
 	For MinGW64, include sys/types.h and time.h.
 	(_WIN32_WINNT) [!_W64]: Don't define for MinGW64.
@@ -548,7 +548,7 @@
 
 	Fix incompatibilities between MinGW.org and MinGW64 headers
 	reported by Óscar Fuentes in
-	https://lists.gnu.org/archive/html/emacs-devel/2013-03/msg00611.html.
+	https://lists.gnu.org/r/emacs-devel/2013-03/msg00611.html.
 	* inc/ms-w32.h (struct timespec): Don't define if
 	_TIMESPEC_DEFINED is already defined.
 	(sigset_t) [!_POSIX]: Typedef for MinGW64.
@@ -724,7 +724,7 @@
 2012-11-21  Eli Zaretskii  <eliz@gnu.org>
 
 	* nmake.defs: Use !if, not !ifdef.  For the details, see
-	https://lists.gnu.org/archive/html/help-emacs-windows/2012-11/msg00027.html
+	https://lists.gnu.org/r/help-emacs-windows/2012-11/msg00027.html
 
 	* inc/stdint.h (INTPTR_MIN)
 	(PTRDIFF_MIN) [!__GNUC__]: Define for MSVC.
@@ -1184,7 +1184,7 @@
 	(dist): Depend on it.
 	(install-shortcuts): Depend on install-addpm instead of copying
 	addpm.exe as part of the recipe.  See
-	https://lists.gnu.org/archive/html/emacs-devel/2012-06/msg00171.html
+	https://lists.gnu.org/r/emacs-devel/2012-06/msg00171.html
 	for the related problem and discussions.
 
 2012-06-11  Glenn Morris  <rgm@gnu.org>
diff --git a/nt/INSTALL.W64 b/nt/INSTALL.W64
index 392ecf2b3a4..e08b72f2ca0 100644
--- a/nt/INSTALL.W64
+++ b/nt/INSTALL.W64
@@ -35,18 +35,6 @@ Run this file to install MSYS2 in your preferred directory, e.g. the default
 C:\msys64 -- this will install MinGW-w64 also.  Note that directory names
 containing spaces may cause problems.
 
-Then you'll need to add the following directories to your Windows PATH
-environment variable:
-
-  c:\msys64\usr\bin;c:\msys64\mingw64\bin
-
-you can do this through Control Panel / System and Security / System /
-Advanced system settings / Environment Variables / Edit path.
-
-Adding these directories to your PATH tells Emacs where to find the DLLs it
-needs to run, and some optional commands like grep and find.  These commands
-will also be available at the Windows console.
-
 ** Download and install the necessary packages
 
 Run c:/msys64/msys2.exe in your MSYS2 directory and you will see a BASH window
@@ -150,11 +138,10 @@ which 'make install' will use - in this example we set it to C:\emacs\emacs-26.
 If a prefix is not specified the files will be put in the standard Unix
 directories located in your C:\msys64 directory, but this is not recommended.
 
-Note also that we need to disable Imagemagick because Emacs does not yet
-support it on Windows.
+Note also that we need to disable Imagemagick and D-Bus because Emacs
+does not yet support them on Windows.
 
-  PKG_CONFIG_PATH=/mingw64/lib/pkgconfig \
-  ./configure --prefix=/c/emacs/emacs-26 --without-imagemagick
+  ./configure --prefix=/c/emacs/emacs-26 --without-imagemagick --without-dbus
 
 ** Run make
 
@@ -192,6 +179,14 @@ To test it out, run
 
 and if all went well, you will have a new 64-bit version of Emacs.
 
+When running Emacs from outside the mingw64 shell, you will need to
+add c:\msys64\mingw64\bin to your Windows PATH, or copy the needed
+DLLs into Emacs' bin/ directory.  Otherwise features such as TLS which
+depend on those DLLs will be missing.
+
+You can do this through Control Panel / System and Security / System /
+Advanced system settings / Environment Variables / Edit path.
+
 * Make a shortcut
 
 To make a shortcut to run the new Emacs, right click on the location where you
@@ -202,6 +197,51 @@ You can set any command line options by right clicking on the resulting
 shortcut, select Properties, then add any options to the Target command,
 e.g. --debug-init.
 
+* Troubleshooting
+
+** Missing mingw64.exe launcher
+
+Older versions of Msys2 may lack the mingw64.exe launcher program.  If
+you have them, running mingw64_shell.bat or "msys2_shell.cmd -mingw64"
+should work instead.
+
+Alternatively, install mingw64.exe with
+
+    pacman -S msys/msys2-launcher-git
+
+** Configure errors
+
+*** Check that mingw64 gcc is accessible
+
+Errors like
+
+    configure: error: Emacs does not support 'x86_64-pc-msys' systems.
+
+or
+
+    checking the compiler's target... configure: error: Impossible to obtain gcc compiler target.
+
+indicate you didn't use the mingw64 launcher, or you didn't install
+gcc.  It's also possible you have something in ~/.bashrc or ~/.profile
+which modifies PATH or MSYSTEM to an unexpected value, preventing gcc
+from being found.  At the mingw64 bash shell, running
+
+    gcc -v
+
+should give output which includes the text
+
+    Target: x86_64-w64-mingw32
+
+*** Check your $PKG_CONFIG_PATH
+
+For a typical MSYS2 install, running
+
+    echo $PKG_CONFIG_PATH
+
+at the mingw64 bash shell should give print a value starting with
+'/mingw64/lib/pkgconfig'.  Incorrect values may prevent configure from
+finding installed libraries.
+
 * Credits
 
 Thanks to Chris Zheng for the original build outline as used by the