Merge branch 'emacs-26' of git.savannah.gnu.org:/srv/git/emacs into emacs-26

4 files changed, 37 insertions, 11 deletions

diff --git a/test/lisp/emacs-lisp/subr-x-tests.el b/test/lisp/emacs-lisp/subr-x-tests.el
index 2c6740a96cf..0e8871d9a9c 100644
--- a/test/lisp/emacs-lisp/subr-x-tests.el
+++ b/test/lisp/emacs-lisp/subr-x-tests.el
@@ -397,9 +397,14 @@
    (should (equal 1 (let ((x 1)) (and-let* (x)))))
    (should (equal nil (and-let* ((x nil)))))
    (should (equal 1 (and-let* ((x 1)))))
-   (should-error (and-let* (nil (x 1))) :type 'setting-constant)
+   ;; The error doesn't trigger when compiled: the compiler will give
+   ;; a warning and then drop the erroneous code.  Therefore, use
+   ;; `eval' to avoid compilation.
+   (should-error (eval '(and-let* (nil (x 1))) lexical-binding)
+                 :type 'setting-constant)
    (should (equal nil (and-let* ((nil) (x 1)))))
-   (should-error (and-let* (2 (x 1))) :type 'wrong-type-argument)
+   (should-error (eval (and-let* (2 (x 1))) lexical-binding)
+                 :type 'wrong-type-argument)
    (should (equal 1 (and-let* ((2) (x 1)))))
    (should (equal 2 (and-let* ((x 1) (2)))))
    (should (equal nil (let ((x nil)) (and-let* (x) x))))
diff --git a/test/lisp/net/tramp-tests.el b/test/lisp/net/tramp-tests.el
index 88e97092ed7..bfdc3017804 100644
--- a/test/lisp/net/tramp-tests.el
+++ b/test/lisp/net/tramp-tests.el
@@ -2653,8 +2653,9 @@ This tests also `make-symbolic-link', `file-truename' and `add-name-to-file'."
            (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 'local quoted))
-           (tmp-name4 (tramp--test-make-temp-name nil quoted)))
-
+           (tmp-name4 (tramp--test-make-temp-name nil quoted))
+           (tmp-name5
+            (expand-file-name (file-name-nondirectory tmp-name1) tmp-name4)))
       ;; Check `make-symbolic-link'.
       (unwind-protect
           (tramp--test-ignore-make-symbolic-link-error
@@ -2716,9 +2717,11 @@ This tests also `make-symbolic-link', `file-truename' and `add-name-to-file'."
               (funcall
                (if quoted 'tramp-compat-file-name-unquote 'identity)
                (file-remote-p tmp-name1 'localname))
-              (file-symlink-p
-               (expand-file-name
-                (file-name-nondirectory tmp-name1) tmp-name4)))))
+              (file-symlink-p tmp-name5)))
+            ;; `smbclient' does not show symlinks in directories, so
+            ;; we cannot delete a non-empty directory.  We delete the
+            ;; file explicitely.
+            (delete-file tmp-name5))
 
         ;; Cleanup.
         (ignore-errors
@@ -2737,7 +2740,7 @@ This tests also `make-symbolic-link', `file-truename' and `add-name-to-file'."
             (should-error
              (add-name-to-file tmp-name1 tmp-name2)
              :type 'file-already-exists)
-            ;; number means interactive case.
+            ;; A number means interactive case.
             (cl-letf (((symbol-function 'yes-or-no-p) 'ignore))
               (should-error
                (add-name-to-file tmp-name1 tmp-name2 0)
diff --git a/test/lisp/textmodes/css-mode-tests.el b/test/lisp/textmodes/css-mode-tests.el
index f93fdbbc5af..47cf5f9244b 100644
--- a/test/lisp/textmodes/css-mode-tests.el
+++ b/test/lisp/textmodes/css-mode-tests.el
@@ -80,6 +80,27 @@
    (equal (seq-sort #'string-lessp (css--value-class-lookup 'position))
           '("bottom" "calc()" "center" "left" "right" "top"))))
 
+(ert-deftest css-test-current-defun-name ()
+  (with-temp-buffer
+    (insert "body { top: 0; }")
+    (goto-char 7)
+    (should (equal (css-current-defun-name) "body"))
+    (goto-char 18)
+    (should (equal (css-current-defun-name) "body"))))
+
+(ert-deftest css-test-current-defun-name-nested ()
+  (with-temp-buffer
+    (insert "body > .main a { top: 0; }")
+    (goto-char 20)
+    (should (equal (css-current-defun-name) "body > .main a"))))
+
+(ert-deftest css-test-current-defun-name-complex ()
+  (with-temp-buffer
+    (insert "input[type=submit]:hover { color: red; }")
+    (goto-char 30)
+    (should (equal (css-current-defun-name)
+                   "input[type=submit]:hover"))))
+
 ;;; Completion
 
 (defun css-mode-tests--completions ()
diff --git a/test/lisp/xdg-tests.el b/test/lisp/xdg-tests.el
index e3c9a743e44..b80f5e85524 100644
--- a/test/lisp/xdg-tests.el
+++ b/test/lisp/xdg-tests.el
@@ -42,9 +42,6 @@
     (should (equal "frobnicate" (gethash "Exec" tab2))))
   (should-error
    (xdg-desktop-read-file
-    (expand-file-name "wrong.desktop" xdg-tests-data-dir)))
-  (should-error
-   (xdg-desktop-read-file
     (expand-file-name "malformed.desktop" xdg-tests-data-dir)))
   (let ((tab (xdg-desktop-read-file
               (expand-file-name "l10n.desktop" xdg-tests-data-dir)))