]> git.eshelyaron.com Git - emacs.git/commitdiff
Add test for Bug#29423 in Tramp.
authorMichael Albinus <michael.albinus@gmx.de>
Sat, 25 Nov 2017 15:03:53 +0000 (16:03 +0100)
committerMichael Albinus <michael.albinus@gmx.de>
Sat, 25 Nov 2017 15:03:53 +0000 (16:03 +0100)
* test/lisp/net/tramp-tests.el (tramp-test17-insert-directory):
Add test for Bug#29423.

lisp/ls-lisp.el
test/lisp/net/tramp-tests.el

index cf3bff5c4821f99042c0962a4f77b626bbdd2762..ad2a770430f1a04aeb843193731b2a84971f3f32 100644 (file)
@@ -843,7 +843,7 @@ SWITCHES and TIME-INDEX give the full switch list and time data."
            " "
            (ls-lisp-format-time file-attr time-index)
            " "
-           (if (not (memq ?F switches)) ; ls-lisp-classify already did that
+           (if (not (memq ?F switches)) ; ls-lisp-classify-file already did that
                (propertize file-name 'dired-filename t)
              file-name)
            (if (stringp file-type)     ; is a symbolic link
index ad9d460d3c7564b4f7c329b93170720e0efac10e..08c58c8027d13e5a78cca9b2cf68b8eed4f20c78 100644 (file)
@@ -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))