[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master 9015329: Fix wdired-get-filename when ls -F marks symlinks
From: |
Lars Ingebrigtsen |
Subject: |
master 9015329: Fix wdired-get-filename when ls -F marks symlinks |
Date: |
Tue, 22 Dec 2020 01:36:59 -0500 (EST) |
branch: master
commit 901532967873ab82d948024105b5736b622f518b
Author: Daniel MartÃn <mardani29@yahoo.es>
Commit: Lars Ingebrigtsen <larsi@gnus.org>
Fix wdired-get-filename when ls -F marks symlinks
* lisp/wdired.el (wdired-get-filename): In some systems like BSD or
macOS, "ls -F" marks symlinks with a trailing "@". Add logic
accounting for this so that wdired-get-filename returns the correct
filename. This change also fixes test "wdired-test-bug34915" on macOS
and BSD systems (bug#34915).
---
lisp/wdired.el | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/lisp/wdired.el b/lisp/wdired.el
index b7dd4ee..c2e1d0c 100644
--- a/lisp/wdired.el
+++ b/lisp/wdired.el
@@ -355,7 +355,10 @@ non-nil means return old filename."
dired-permission-flags-regexp nil t)
(goto-char (match-beginning 0))
(looking-at "l")
- (search-forward " -> " (line-end-position) t)))
+ (if (and used-F
+ dired-ls-F-marks-symlinks)
+ (re-search-forward "@? -> " (line-end-position) t)
+ (search-forward " -> " (line-end-position) t))))
(goto-char (match-beginning 0))
(setq end (point)))
(when (and used-F
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- master 9015329: Fix wdired-get-filename when ls -F marks symlinks,
Lars Ingebrigtsen <=