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

8 files changed, 29 insertions, 7 deletions

diff --git a/test/lisp/char-fold-tests.el b/test/lisp/char-fold-tests.el
index a16f2879809..8be22973913 100644
--- a/test/lisp/char-fold-tests.el
+++ b/test/lisp/char-fold-tests.el
@@ -102,7 +102,7 @@
     (char-fold--test-match-exactly "a1" "xx44" "99")
     (char-fold--test-match-exactly "a12" "77" "xx442" "992")
     ;; Support for this case is disabled.  See function definition or:
-    ;; https://lists.gnu.org/archive/html/emacs-devel/2015-11/msg02562.html
+    ;; https://lists.gnu.org/r/emacs-devel/2015-11/msg02562.html
     ;; (char-fold--test-match-exactly "a12" "xxyy")
     ))
 
diff --git a/test/lisp/files-tests.el b/test/lisp/files-tests.el
index 285a884b695..732b3c02379 100644
--- a/test/lisp/files-tests.el
+++ b/test/lisp/files-tests.el
@@ -411,5 +411,19 @@ name (Bug#28412)."
     (should (file-directory-p (concat (file-name-as-directory dest2) "a")))
     (delete-directory dir 'recursive)))
 
+(ert-deftest files-test-abbreviated-home-dir ()
+  "Test that changing HOME does not confuse `abbreviate-file-name'.
+See <https://debbugs.gnu.org/19657#20>."
+  (let* ((homedir temporary-file-directory)
+         (process-environment (cons (format "HOME=%s" homedir)
+                                    process-environment))
+         (abbreviated-home-dir nil)
+         (testfile (expand-file-name "foo" homedir))
+         (old (file-truename (abbreviate-file-name testfile)))
+         (process-environment (cons (format "HOME=%s"
+                                            (expand-file-name "bar" homedir))
+                                    process-environment)))
+    (should (equal old (file-truename (abbreviate-file-name testfile))))))
+
 (provide 'files-tests)
 ;;; files-tests.el ends here
diff --git a/test/lisp/net/tramp-tests.el b/test/lisp/net/tramp-tests.el
index 491ff60e3e8..efc2c578d59 100644
--- a/test/lisp/net/tramp-tests.el
+++ b/test/lisp/net/tramp-tests.el
@@ -2313,6 +2313,14 @@ This tests also `file-directory-p' and `file-accessible-directory-p'."
               (insert-directory tmp-name1 nil)
               (goto-char (point-min))
               (should (looking-at-p (regexp-quote tmp-name1))))
+            ;; This has been fixed in Emacs 26.1.  See Bug#29423.
+            (when (tramp--test-emacs26-p)
+              (with-temp-buffer
+                (insert-directory (file-name-as-directory tmp-name1) nil)
+                (goto-char (point-min))
+                (should
+                 (looking-at-p
+                  (regexp-quote (file-name-as-directory tmp-name1))))))
             (with-temp-buffer
               (insert-directory tmp-name1 "-al")
               (goto-char (point-min))
diff --git a/test/lisp/replace-tests.el b/test/lisp/replace-tests.el
index 06b6dd8a0a9..e9564e555ee 100644
--- a/test/lisp/replace-tests.el
+++ b/test/lisp/replace-tests.el
@@ -54,7 +54,7 @@ fx
       6:fx
 ")
     ;; * Test multi-line matches, this is the first test from
-    ;; https://lists.gnu.org/archive/html/emacs-devel/2005-06/msg01008.html
+    ;; https://lists.gnu.org/r/emacs-devel/2005-06/msg01008.html
     ;; where numbers are replaced with letters.
     ("a\na" 0 "\
 a
@@ -70,7 +70,7 @@ a
        :a
 ")
     ;; * Test multi-line matches, this is the second test from
-    ;; https://lists.gnu.org/archive/html/emacs-devel/2005-06/msg01008.html
+    ;; https://lists.gnu.org/r/emacs-devel/2005-06/msg01008.html
     ;; where numbers are replaced with letters.
     ("a\nb" 0 "\
 a
diff --git a/test/lisp/simple-tests.el b/test/lisp/simple-tests.el
index 5133e686a15..521365bbb94 100644
--- a/test/lisp/simple-tests.el
+++ b/test/lisp/simple-tests.el
@@ -280,7 +280,7 @@
      (undo-auto--boundaries 'test))))
 
 ;; Test for a regression introduced by undo-auto--boundaries changes.
-;; https://lists.gnu.org/archive/html/emacs-devel/2015-11/msg01652.html
+;; https://lists.gnu.org/r/emacs-devel/2015-11/msg01652.html
 (defun undo-test-kill-c-a-then-undo ()
   (with-temp-buffer
     (switch-to-buffer (current-buffer))
diff --git a/test/lisp/vc/vc-bzr-tests.el b/test/lisp/vc/vc-bzr-tests.el
index 85f401eb37b..24bfd4266e6 100644
--- a/test/lisp/vc/vc-bzr-tests.el
+++ b/test/lisp/vc/vc-bzr-tests.el
@@ -106,7 +106,7 @@
           (should (get-buffer "*vc-log*")))
       (delete-directory homedir t))))
 
-;; https://lists.gnu.org/archive/html/help-gnu-emacs/2012-04/msg00145.html
+;; https://lists.gnu.org/r/help-gnu-emacs/2012-04/msg00145.html
 (ert-deftest vc-bzr-test-faulty-bzr-autoloads ()
   "Test we can generate autoloads in a bzr directory when bzr is faulty."
   (skip-unless (executable-find vc-bzr-program))
diff --git a/test/manual/etags/c-src/emacs/src/lisp.h b/test/manual/etags/c-src/emacs/src/lisp.h
index 0c7da366519..c87fb63db85 100644
--- a/test/manual/etags/c-src/emacs/src/lisp.h
+++ b/test/manual/etags/c-src/emacs/src/lisp.h
@@ -510,7 +510,7 @@ enum Lisp_Fwd_Type
 
 /* If you want to define a new Lisp data type, here are some
    instructions.  See the thread at
-   https://lists.gnu.org/archive/html/emacs-devel/2012-10/msg00561.html
+   https://lists.gnu.org/r/emacs-devel/2012-10/msg00561.html
    for more info.
 
    First, there are already a couple of Lisp types that can be used if
diff --git a/test/src/fns-tests.el b/test/src/fns-tests.el
index d751acb7478..705d02fdff6 100644
--- a/test/src/fns-tests.el
+++ b/test/src/fns-tests.el
@@ -154,7 +154,7 @@
             (9 . "aaa") (9 . "zzz") (9 . "ppp") (9 . "fff")])))
 
 (ert-deftest fns-tests-collate-sort ()
-  ;; See https://lists.gnu.org/archive/html/emacs-devel/2015-10/msg02505.html.
+  ;; See https://lists.gnu.org/r/emacs-devel/2015-10/msg02505.html.
   :expected-result (if (eq system-type 'cygwin) :failed :passed)
   (skip-unless (fns-tests--collate-enabled-p))