From 55c5b12fa040b0c4e1549207840fd6c84e5d2b19 Mon Sep 17 00:00:00 2001 From: Michael Albinus Date: Sat, 25 Nov 2017 16:03:53 +0100 Subject: [PATCH] Add test for Bug#29423 in Tramp. * test/lisp/net/tramp-tests.el (tramp-test17-insert-directory): Add test for Bug#29423. --- lisp/ls-lisp.el | 2 +- test/lisp/net/tramp-tests.el | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/lisp/ls-lisp.el b/lisp/ls-lisp.el index cf3bff5c482..ad2a770430f 100644 --- a/lisp/ls-lisp.el +++ b/lisp/ls-lisp.el @@ -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 diff --git a/test/lisp/net/tramp-tests.el b/test/lisp/net/tramp-tests.el index ad9d460d3c7..08c58c8027d 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)) -- 2.39.2