Merge from origin/emacs-26

11bd8aa24b Fix flymake's loading of subr-x
b500e06f4d Fix Bug#28896
d815de017b Skip a Flymake test for old gcc versions
fd3d8610b2 Make :align-to account for display-line-numbers
831eafc8ae Augment Flymake API for third-party extensions
ddd547fada Improve treatment of Fortran's "class default"
234b1e3864 Flymake backends must check proc obsoleteness in source bu...
3ea6a4d4ba Skip an rsync test in tramp-tests.el
25f83fa7c5 ; Indentation fixes
4d578d432d On Windows default a frame's border width to zero (Bug#28873)
6f1dea5c74 Spelling fixes
b8433b0954 Use pop-to-buffer-same-window instead of switch-to-buffer
2f7163fb72 Fix the MSDOS build.
2551d28fe8 Fix line number display after 'widen'
dc8812829b Remove resizable attribute on macOS undecorated frames (bu...
b970a4a52a Fix handling of `border-width' in `frameset--restore-frame...
445e92658f Mention how to send CC to > 1 address in a bug report
8ca6fa585a Improve format-time-string doc
2e1b3522b8 Improve documentation of 'line-number-display-width'
5b6e59cfdb Implement vc-default-dir-extra-headers for vc-rcs
22adeca42a In NEWS give advice on use of `switch-to-buffer' (Bug#28645)
2c3e6f1ddc Dont update primary selection with winner-undo
b38724ab67 Work around ImageMagick bug 825
20cc68e871 Document rectangle-preview option more (Bug#27974)
a0b7b301dd Do not reject https://gnu.org in commit messages
fb4200a875 Fix Edebug spec for cl-defun (bug#24255)
db68cefe72 Fix errors in kmacro.el post-command-hook
c63b344c3d Fix range-error in image-dired.el
081d2187c4 Fix 'line-number-display-width' in hscrolled windows
16e85456e7 Fix error in tramp-smb-handle-insert-directory
613db8d35c Don't reject PBM header whitespace unnecessarily
3205b12a78 Fix regression in display of PPM images
1ca9ae7069 Require subr-x when compiling nnimap.el
de60992053 Fix ert-test finding by symbol (Bug#28849)
51615a8082 Don't remember old debugger window (Bug#17882)
5980de3727 Disable python native completion on w32 (Bug#28580)
616b4c5956 Let select-frame-by-name choose any frame when called from...
8eb3c01dbd * lisp/dired-aux.el (dired-create-directory): Doc fix.
325dfdae13 Avoid compilation warnings in optimized builds
f79382819c ; * src/composite.c (Fclear_composition_cache): Fix last c...
f95cd5cd70 Improve customization of arabic-shaper-ZWNJ-handling.
a7f154688d Improve customization type of 'mouse-drag-and-drop-region'
864734d112 ; Prefer https: to http: in GNU URLs
3c78960a47 Encourage https: in commit messages
def9715282 ; Cleanup of etc/NEWS
4e59ecc646 Fix wording in Elisp manual's child frames section (Bug#28...
eda9f5018c Another fix for C mode fontification of w32 source files
05aadd8990 Fix fontification of ALIGN_STACK functions
aa0c38f358 Make sure thread stack is properly aligned on MS-Windows
d7038020aa Do not under-align pseudovectors
ff33053012 Fix indentation bug in multi-line CSS selectors
8968be822e ; * etc/NEWS: Grammar and spelling fixes
716b84034d gnutls_mac_get_nonce_size has been added in gnutls 3.3
55e313f7be ; * CONTRIBUTE: More suggestions for using US English.
622c675648 * CONTRIBUTE: Suggest American English.

# Conflicts:
#	etc/NEWS
#	msdos/sed2v2.inp

5 files changed, 217 insertions, 201 deletions

diff --git a/test/lisp/kmacro-tests.el b/test/lisp/kmacro-tests.el
index 9f3eeafe486..690d5029231 100644
--- a/test/lisp/kmacro-tests.el
+++ b/test/lisp/kmacro-tests.el
@@ -818,7 +818,6 @@ This is a regression for item 7 in Bug#24991."
 
 (kmacro-tests-deftest kmacro-tests-step-edit-cleans-up-hook ()
   "Step-editing properly cleans up `post-command-hook.' (Bug #18708)"
-  (:expected-result :failed)
   (let (post-command-hook)
     (setq-local post-command-hook '(t))
     (kmacro-tests-run-step-edit "x"
diff --git a/test/lisp/net/tramp-tests.el b/test/lisp/net/tramp-tests.el
index 7cc0779b81c..e92d1b6203c 100644
--- a/test/lisp/net/tramp-tests.el
+++ b/test/lisp/net/tramp-tests.el
@@ -1883,96 +1883,98 @@ This checks also `file-name-as-directory', `file-name-directory',
   (let (quoted)
     (let ((tmp-name1 (tramp--test-make-temp-name nil quoted))
           (tmp-name2 (tramp--test-make-temp-name nil quoted))
-          (tmp-name3 (tramp--test-make-temp-name nil quoted))
-          (tmp-name4 (tramp--test-make-temp-name 'local quoted))
-          (tmp-name5 (tramp--test-make-temp-name 'local quoted)))
-
-      ;; Copy on remote side.
-      (unwind-protect
-          (progn
-            (write-region "foo" nil tmp-name1)
-            (copy-file tmp-name1 tmp-name2)
-            (should (file-exists-p tmp-name2))
-            (with-temp-buffer
-              (insert-file-contents tmp-name2)
-              (should (string-equal (buffer-string) "foo")))
-            (should-error
-             (copy-file tmp-name1 tmp-name2)
-             :type 'file-already-exists)
-            (copy-file tmp-name1 tmp-name2 'ok)
-            (make-directory tmp-name3)
-            ;; This has been changed in Emacs 26.1.
-            (when (tramp--test-emacs26-p)
-              (should-error
-               (copy-file tmp-name1 tmp-name3)
-               :type 'file-already-exists))
-            (copy-file tmp-name1 (file-name-as-directory tmp-name3))
-            (should
-             (file-exists-p
-              (expand-file-name (file-name-nondirectory tmp-name1) tmp-name3))))
-
-        ;; Cleanup.
-        (ignore-errors (delete-file tmp-name1))
-        (ignore-errors (delete-file tmp-name2))
-        (ignore-errors (delete-directory tmp-name3 'recursive)))
-
-      ;; Copy from remote side to local side.
-      (unwind-protect
-          (progn
-            (write-region "foo" nil tmp-name1)
-            (copy-file tmp-name1 tmp-name4)
-            (should (file-exists-p tmp-name4))
-            (with-temp-buffer
-              (insert-file-contents tmp-name4)
-              (should (string-equal (buffer-string) "foo")))
-            (should-error
-             (copy-file tmp-name1 tmp-name4)
-             :type 'file-already-exists)
-            (copy-file tmp-name1 tmp-name4 'ok)
-            (make-directory tmp-name5)
-            ;; This has been changed in Emacs 26.1.
-            (when (tramp--test-emacs26-p)
-              (should-error
-               (copy-file tmp-name1 tmp-name5)
-               :type 'file-already-exists))
-            (copy-file tmp-name1 (file-name-as-directory tmp-name5))
-            (should
-             (file-exists-p
-              (expand-file-name (file-name-nondirectory tmp-name1) tmp-name5))))
-
-        ;; Cleanup.
-        (ignore-errors (delete-file tmp-name1))
-        (ignore-errors (delete-file tmp-name4))
-        (ignore-errors (delete-directory tmp-name5 'recursive)))
-
-      ;; Copy from local side to remote side.
-      (unwind-protect
-          (progn
-            (write-region "foo" nil tmp-name4 nil 'nomessage)
-            (copy-file tmp-name4 tmp-name1)
-            (should (file-exists-p tmp-name1))
-            (with-temp-buffer
-              (insert-file-contents tmp-name1)
-              (should (string-equal (buffer-string) "foo")))
-            (should-error
-             (copy-file tmp-name4 tmp-name1)
-             :type 'file-already-exists)
-            (copy-file tmp-name4 tmp-name1 'ok)
-            (make-directory tmp-name3)
-            ;; This has been changed in Emacs 26.1.
-            (when (tramp--test-emacs26-p)
-              (should-error
-               (copy-file tmp-name4 tmp-name3)
-               :type 'file-already-exists))
-            (copy-file tmp-name4 (file-name-as-directory tmp-name3))
-            (should
-             (file-exists-p
-              (expand-file-name (file-name-nondirectory tmp-name4) tmp-name3))))
+          (tmp-name3 (tramp--test-make-temp-name 'local quoted)))
+      (dolist (source-target
+               `(;; Copy on remote side.
+                 (,tmp-name1 . ,tmp-name2)
+                 ;; Copy from remote side to local side.
+                 (,tmp-name1 . ,tmp-name3)
+                 ;; Copy from local side to remote side.
+                 (,tmp-name3 . ,tmp-name1)))
+        (let ((source (car source-target))
+              (target (cdr source-target)))
+
+          ;; Copy simple file.
+          (unwind-protect
+              (progn
+                (write-region "foo" nil source)
+                (should (file-exists-p source))
+                (copy-file source target)
+                (should (file-exists-p target))
+                (with-temp-buffer
+                  (insert-file-contents target)
+                  (should (string-equal (buffer-string) "foo")))
+                (should-error
+                 (copy-file source target)
+                 :type 'file-already-exists)
+                (copy-file source target 'ok))
+
+            ;; Cleanup.
+            (ignore-errors (delete-file source))
+            (ignore-errors (delete-file target)))
+
+          ;; Copy file to directory.
+          (unwind-protect
+              (progn
+                (write-region "foo" nil source)
+                (should (file-exists-p source))
+                (make-directory target)
+                (should (file-directory-p target))
+                ;; This has been changed in Emacs 26.1.
+                (when (tramp--test-emacs26-p)
+                  (should-error
+                   (copy-file source target)
+                   :type 'file-already-exists))
+                (copy-file source (file-name-as-directory target))
+                (should
+                 (file-exists-p
+                  (expand-file-name (file-name-nondirectory source) target))))
+
+            ;; Cleanup.
+            (ignore-errors (delete-file source))
+            (ignore-errors (delete-directory target 'recursive)))
+
+          ;; Copy directory to existing directory.
+          (unwind-protect
+              (progn
+                (make-directory source)
+                (should (file-directory-p source))
+                (write-region "foo" nil (expand-file-name "foo" source))
+                (should (file-exists-p (expand-file-name "foo" source)))
+                (make-directory target)
+                (should (file-directory-p target))
+                ;; Directory `target' exists already, so we must use
+                ;; `file-name-as-directory'.
+                (copy-file source (file-name-as-directory target))
+                (should
+                 (file-exists-p
+                  (expand-file-name
+                   (concat (file-name-nondirectory source) "/foo") target))))
+
+            ;; Cleanup.
+            (ignore-errors (delete-directory source 'recursive))
+            (ignore-errors (delete-directory target 'recursive)))
+
+          ;; Copy directory/file to non-existing directory.
+          (unwind-protect
+              (progn
+                (make-directory source)
+                (should (file-directory-p source))
+                (write-region "foo" nil (expand-file-name "foo" source))
+                (should (file-exists-p (expand-file-name "foo" source)))
+                (make-directory target)
+                (should (file-directory-p target))
+                (copy-file
+                 source
+                 (expand-file-name (file-name-nondirectory source) target))
+                (should
+                 (file-exists-p
+                  (expand-file-name
+                   (concat (file-name-nondirectory source) "/foo") target))))
 
-        ;; Cleanup.
-        (ignore-errors (delete-file tmp-name1))
-        (ignore-errors (delete-file tmp-name4))
-        (ignore-errors (delete-directory tmp-name3 'recursive))))))
+            ;; Cleanup.
+            (ignore-errors (delete-directory source 'recursive))
+            (ignore-errors (delete-directory target 'recursive))))))))
 
 (ert-deftest tramp-test12-rename-file ()
   "Check `rename-file'."
@@ -1983,111 +1985,105 @@ This checks also `file-name-as-directory', `file-name-directory',
   (let (quoted)
     (let ((tmp-name1 (tramp--test-make-temp-name nil quoted))
           (tmp-name2 (tramp--test-make-temp-name nil quoted))
-          (tmp-name3 (tramp--test-make-temp-name nil quoted))
-          (tmp-name4 (tramp--test-make-temp-name 'local quoted))
-          (tmp-name5 (tramp--test-make-temp-name 'local quoted)))
-
-      ;; Rename on remote side.
-      (unwind-protect
-          (progn
-            (write-region "foo" nil tmp-name1)
-            (rename-file tmp-name1 tmp-name2)
-            (should-not (file-exists-p tmp-name1))
-            (should (file-exists-p tmp-name2))
-            (with-temp-buffer
-              (insert-file-contents tmp-name2)
-              (should (string-equal (buffer-string) "foo")))
-            (write-region "foo" nil tmp-name1)
-            (should-error
-             (rename-file tmp-name1 tmp-name2)
-             :type 'file-already-exists)
-            (rename-file tmp-name1 tmp-name2 'ok)
-            (should-not (file-exists-p tmp-name1))
-            (write-region "foo" nil tmp-name1)
-            (make-directory tmp-name3)
-            ;; This has been changed in Emacs 26.1.
-            (when (tramp--test-emacs26-p)
-              (should-error
-               (rename-file tmp-name1 tmp-name3)
-               :type 'file-already-exists))
-            (rename-file tmp-name1 (file-name-as-directory tmp-name3))
-            (should-not (file-exists-p tmp-name1))
-            (should
-             (file-exists-p
-              (expand-file-name (file-name-nondirectory tmp-name1) tmp-name3))))
-
-        ;; Cleanup.
-        (ignore-errors (delete-file tmp-name1))
-        (ignore-errors (delete-file tmp-name2))
-        (ignore-errors (delete-directory tmp-name3 'recursive)))
-
-      ;; Rename from remote side to local side.
-      (unwind-protect
-          (progn
-            (write-region "foo" nil tmp-name1)
-            (rename-file tmp-name1 tmp-name4)
-            (should-not (file-exists-p tmp-name1))
-            (should (file-exists-p tmp-name4))
-            (with-temp-buffer
-              (insert-file-contents tmp-name4)
-              (should (string-equal (buffer-string) "foo")))
-            (write-region "foo" nil tmp-name1)
-            (should-error
-             (rename-file tmp-name1 tmp-name4)
-             :type 'file-already-exists)
-            (rename-file tmp-name1 tmp-name4 'ok)
-            (should-not (file-exists-p tmp-name1))
-            (write-region "foo" nil tmp-name1)
-            (make-directory tmp-name5)
-            ;; This has been changed in Emacs 26.1.
-            (when (tramp--test-emacs26-p)
-              (should-error
-               (rename-file tmp-name1 tmp-name5)
-               :type 'file-already-exists))
-            (rename-file tmp-name1 (file-name-as-directory tmp-name5))
-            (should-not (file-exists-p tmp-name1))
-            (should
-             (file-exists-p
-              (expand-file-name (file-name-nondirectory tmp-name1) tmp-name5))))
-
-        ;; Cleanup.
-        (ignore-errors (delete-file tmp-name1))
-        (ignore-errors (delete-file tmp-name4))
-        (ignore-errors (delete-directory tmp-name5 'recursive)))
-
-      ;; Rename from local side to remote side.
-      (unwind-protect
-          (progn
-            (write-region "foo" nil tmp-name4 nil 'nomessage)
-            (rename-file tmp-name4 tmp-name1)
-            (should-not (file-exists-p tmp-name4))
-            (should (file-exists-p tmp-name1))
-            (with-temp-buffer
-              (insert-file-contents tmp-name1)
-              (should (string-equal (buffer-string) "foo")))
-            (write-region "foo" nil tmp-name4 nil 'nomessage)
-            (should-error
-             (rename-file tmp-name4 tmp-name1)
-             :type 'file-already-exists)
-            (rename-file tmp-name4 tmp-name1 'ok)
-            (should-not (file-exists-p tmp-name4))
-            (write-region "foo" nil tmp-name4 nil 'nomessage)
-            (make-directory tmp-name3)
-            ;; This has been changed in Emacs 26.1.
-            (when (tramp--test-emacs26-p)
-              (should-error
-               (rename-file tmp-name4 tmp-name3)
-               :type 'file-already-exists))
-            (rename-file tmp-name4 (file-name-as-directory tmp-name3))
-            (should-not (file-exists-p tmp-name4))
-            (should
-             (file-exists-p
-              (expand-file-name (file-name-nondirectory tmp-name4) tmp-name3))))
+          (tmp-name3 (tramp--test-make-temp-name 'local quoted)))
+      (dolist (source-target
+               `(;; Rename on remote side.
+                 (,tmp-name1 . ,tmp-name2)
+                 ;; Rename from remote side to local side.
+                 (,tmp-name1 . ,tmp-name3)
+                 ;; Rename from local side to remote side.
+                 (,tmp-name3 . ,tmp-name1)))
+        (let ((source (car source-target))
+              (target (cdr source-target)))
+
+          ;; Rename simple file.
+          (unwind-protect
+              (progn
+                (write-region "foo" nil source)
+                (should (file-exists-p source))
+                (rename-file source target)
+                (should-not (file-exists-p source))
+                (should (file-exists-p target))
+                (with-temp-buffer
+                  (insert-file-contents target)
+                  (should (string-equal (buffer-string) "foo")))
+                (write-region "foo" nil source)
+                (should (file-exists-p source))
+                (should-error
+                 (rename-file source target)
+                 :type 'file-already-exists)
+                (rename-file source target 'ok)
+                (should-not (file-exists-p source)))
+
+            ;; Cleanup.
+            (ignore-errors (delete-file source))
+            (ignore-errors (delete-file target)))
+
+          ;; Rename file to directory.
+          (unwind-protect
+              (progn
+                (write-region "foo" nil source)
+                (should (file-exists-p source))
+                (make-directory target)
+                (should (file-directory-p target))
+                ;; This has been changed in Emacs 26.1.
+                (when (tramp--test-emacs26-p)
+                  (should-error
+                   (rename-file source target)
+                   :type 'file-already-exists))
+                (rename-file source (file-name-as-directory target))
+                (should-not (file-exists-p source))
+                (should
+                 (file-exists-p
+                  (expand-file-name (file-name-nondirectory source) target))))
+
+            ;; Cleanup.
+            (ignore-errors (delete-file source))
+            (ignore-errors (delete-directory target 'recursive)))
+
+          ;; Rename directory to existing directory.
+          (unwind-protect
+              (progn
+                (make-directory source)
+                (should (file-directory-p source))
+                (write-region "foo" nil (expand-file-name "foo" source))
+                (should (file-exists-p (expand-file-name "foo" source)))
+                (make-directory target)
+                (should (file-directory-p target))
+                ;; Directory `target' exists already, so we must use
+                ;; `file-name-as-directory'.
+                (rename-file source (file-name-as-directory target))
+                (should-not (file-exists-p source))
+                (should
+                 (file-exists-p
+                  (expand-file-name
+                   (concat (file-name-nondirectory source) "/foo") target))))
+
+            ;; Cleanup.
+            (ignore-errors (delete-directory source 'recursive))
+            (ignore-errors (delete-directory target 'recursive)))
+
+          ;; Rename directory/file to non-existing directory.
+          (unwind-protect
+              (progn
+                (make-directory source)
+                (should (file-directory-p source))
+                (write-region "foo" nil (expand-file-name "foo" source))
+                (should (file-exists-p (expand-file-name "foo" source)))
+                (make-directory target)
+                (should (file-directory-p target))
+                (rename-file
+                 source
+                 (expand-file-name (file-name-nondirectory source) target))
+                (should-not (file-exists-p source))
+                (should
+                 (file-exists-p
+                  (expand-file-name
+                   (concat (file-name-nondirectory source) "/foo") target))))
 
-        ;; Cleanup.
-        (ignore-errors (delete-file tmp-name1))
-        (ignore-errors (delete-file tmp-name4))
-        (ignore-errors (delete-directory tmp-name3 'recursive))))))
+            ;; Cleanup.
+            (ignore-errors (delete-directory source 'recursive))
+            (ignore-errors (delete-directory target 'recursive))))))))
 
 (ert-deftest tramp-test13-make-directory ()
   "Check `make-directory'.
@@ -2346,6 +2342,7 @@ This tests also `file-directory-p' and `file-accessible-directory-p'."
   "Check `dired' with wildcards."
   (skip-unless (tramp--test-enabled))
   (skip-unless (tramp--test-sh-p))
+  (skip-unless (not (tramp--test-rsync-p)))
   ;; Since Emacs 26.1.
   (skip-unless (fboundp 'insert-directory-wildcard-in-dir-p))
 
@@ -4394,6 +4391,7 @@ Since it unloads Tramp, it shall be the last test to run."
 ;; * Fix `tramp-test05-expand-file-name-relative' in `expand-file-name'.
 ;; * Fix `tramp-test06-directory-file-name' for `ftp'.
 ;; * Fix `tramp-test27-start-file-process' on MS Windows (`process-send-eof'?).
+;; * Fix `tramp-test28-interrupt-process', timeout doesn't work reliably.
 ;; * Fix Bug#16928 in `tramp-test38-asynchronous-requests'.
 
 (defun tramp-test-all (&optional interactive)
diff --git a/test/lisp/progmodes/f90-tests.el b/test/lisp/progmodes/f90-tests.el
index 0c03a190ca2..2a9100adff6 100644
--- a/test/lisp/progmodes/f90-tests.el
+++ b/test/lisp/progmodes/f90-tests.el
@@ -256,21 +256,25 @@ end program prog")
     (should (= 5 (current-indentation)))))
 
 (ert-deftest f90-test-bug25039 ()
-  "Test for https://debbugs.gnu.org/25039 ."
+  "Test for https://debbugs.gnu.org/25039 and 28786."
   (with-temp-buffer
     (f90-mode)
     (insert "program prog
 select type (a)
-class is (c1)
-x = 1
 type is (t1)
 x = 2
+class is (c1)
+x = 1
+class default
+x=3
 end select
 end program prog")
     (f90-indent-subprogram)
     (forward-line -3)
-    (should (= 2 (current-indentation))) ; type is
+    (should (= 2 (current-indentation))) ; class default
+    (forward-line -2)
+    (should (= 2 (current-indentation))) ; class is
     (forward-line -2)
-    (should (= 2 (current-indentation))))) ; class is
+    (should (= 2 (current-indentation))))) ; type is
 
 ;;; f90-tests.el ends here
diff --git a/test/lisp/progmodes/flymake-tests.el b/test/lisp/progmodes/flymake-tests.el
index 0b29b6a9715..cfa810053ca 100644
--- a/test/lisp/progmodes/flymake-tests.el
+++ b/test/lisp/progmodes/flymake-tests.el
@@ -24,6 +24,7 @@
 ;;; Code:
 (require 'ert)
 (require 'flymake)
+(eval-when-compile (require 'subr-x)) ; string-trim
 
 (defvar flymake-tests-data-directory
   (expand-file-name "lisp/progmodes/flymake-resources"
@@ -37,7 +38,7 @@
 ;;
 ;;
 (defun flymake-tests--wait-for-backends ()
-  ;; Weirdness here...  http://debbugs.gnu.org/17647#25
+  ;; Weirdness here...  https://debbugs.gnu.org/17647#25
   ;; ... meaning `sleep-for', and even
   ;; `accept-process-output', won't suffice as ways to get
   ;; process filters and sentinels to run, though they do work
@@ -128,7 +129,11 @@ SEVERITY-PREDICATE is used to setup
 
 (ert-deftest different-diagnostic-types ()
   "Test GCC warning via function predicate."
-  (skip-unless (and (executable-find "gcc") (executable-find "make")))
+  (skip-unless (and (executable-find "gcc")
+                    (version<=
+                     "5" (string-trim
+                          (shell-command-to-string "gcc -dumpversion")))
+                    (executable-find "make")))
   (let ((flymake-wrap-around nil))
     (flymake-tests--with-flymake
         ("errors-and-warnings.c")
diff --git a/test/manual/indent/css-mode.css b/test/manual/indent/css-mode.css
index bf612b53a14..640418b022d 100644
--- a/test/manual/indent/css-mode.css
+++ b/test/manual/indent/css-mode.css
@@ -66,6 +66,16 @@ div::before {
     );
 }
 
+/* Multi-line selector including both a pseudo-class and
+   parenthesis. */
+.form-group:not(.required) label,
+.birth-date .row > * {
+    &::after {
+        display: inline;
+        font-weight: normal;
+    }
+}
+
 @font-face {
     src: url("Sans-Regular.eot") format("eot"),
          url("Sans-Regular.woff") format("woff"),