diff options
| author | Michael Albinus | 2017-11-25 16:03:53 +0100 |
|---|---|---|
| committer | Michael Albinus | 2017-11-25 16:03:53 +0100 |
| commit | 55c5b12fa040b0c4e1549207840fd6c84e5d2b19 (patch) | |
| tree | c0e4b47a77fc6b79eb74cad2cd98155431eaed3e | |
| parent | 3198a1646e743dbf8178efb8bba7dea6230f2874 (diff) | |
| download | emacs-55c5b12fa040b0c4e1549207840fd6c84e5d2b19.tar.gz emacs-55c5b12fa040b0c4e1549207840fd6c84e5d2b19.zip | |
Add test for Bug#29423 in Tramp.
* test/lisp/net/tramp-tests.el (tramp-test17-insert-directory):
Add test for Bug#29423.
| -rw-r--r-- | lisp/ls-lisp.el | 2 | ||||
| -rw-r--r-- | test/lisp/net/tramp-tests.el | 8 |
2 files changed, 9 insertions, 1 deletions
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." | |||
| 843 | " " | 843 | " " |
| 844 | (ls-lisp-format-time file-attr time-index) | 844 | (ls-lisp-format-time file-attr time-index) |
| 845 | " " | 845 | " " |
| 846 | (if (not (memq ?F switches)) ; ls-lisp-classify already did that | 846 | (if (not (memq ?F switches)) ; ls-lisp-classify-file already did that |
| 847 | (propertize file-name 'dired-filename t) | 847 | (propertize file-name 'dired-filename t) |
| 848 | file-name) | 848 | file-name) |
| 849 | (if (stringp file-type) ; is a symbolic link | 849 | (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'." | |||
| 2313 | (insert-directory tmp-name1 nil) | 2313 | (insert-directory tmp-name1 nil) |
| 2314 | (goto-char (point-min)) | 2314 | (goto-char (point-min)) |
| 2315 | (should (looking-at-p (regexp-quote tmp-name1)))) | 2315 | (should (looking-at-p (regexp-quote tmp-name1)))) |
| 2316 | ;; This has been fixed in Emacs 26.1. See Bug#29423. | ||
| 2317 | (when (tramp--test-emacs26-p) | ||
| 2318 | (with-temp-buffer | ||
| 2319 | (insert-directory (file-name-as-directory tmp-name1) nil) | ||
| 2320 | (goto-char (point-min)) | ||
| 2321 | (should | ||
| 2322 | (looking-at-p | ||
| 2323 | (regexp-quote (file-name-as-directory tmp-name1)))))) | ||
| 2316 | (with-temp-buffer | 2324 | (with-temp-buffer |
| 2317 | (insert-directory tmp-name1 "-al") | 2325 | (insert-directory tmp-name1 "-al") |
| 2318 | (goto-char (point-min)) | 2326 | (goto-char (point-min)) |