From: Michael Albinus <michael.albinus@gmx.de>
Date: Sat, 25 Nov 2017 15:03:53 +0000 (+0100)
Subject: Add test for Bug#29423 in Tramp.
X-Git-Tag: emacs-26.0.91~248
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=55c5b12fa0;p=emacs.git

Add test for Bug#29423 in Tramp.

* test/lisp/net/tramp-tests.el (tramp-test17-insert-directory):
Add test for Bug#29423.
---

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))