[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master bc0aca0: Fix dired-guess-default logic after previous change
From: |
Lars Ingebrigtsen |
Subject: |
master bc0aca0: Fix dired-guess-default logic after previous change |
Date: |
Wed, 21 Jul 2021 07:04:13 -0400 (EDT) |
branch: master
commit bc0aca059dbfe8cd485d9591f36efb70a2a6272e
Author: Lars Ingebrigtsen <larsi@gnus.org>
Commit: Lars Ingebrigtsen <larsi@gnus.org>
Fix dired-guess-default logic after previous change
* lisp/dired-x.el (dired-guess-default): Restore previous logic --
require matches for all files (bug#48071).
---
lisp/dired-x.el | 7 ++++---
test/lisp/dired-x-tests.el | 5 +++--
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/lisp/dired-x.el b/lisp/dired-x.el
index 2d91b5a..073923e 100644
--- a/lisp/dired-x.el
+++ b/lisp/dired-x.el
@@ -979,9 +979,10 @@ See `dired-guess-shell-alist-user'."
#'append
(mapcar #'cdr
(seq-filter (lambda (elem)
- (seq-some (lambda (file)
- (string-match-p (car elem) file))
- files))
+ (seq-every-p
+ (lambda (file)
+ (string-match-p (car elem) file))
+ files))
(append dired-guess-shell-alist-user
dired-guess-shell-alist-default)))
nil))))
diff --git a/test/lisp/dired-x-tests.el b/test/lisp/dired-x-tests.el
index 98754b1..003923d 100644
--- a/test/lisp/dired-x-tests.el
+++ b/test/lisp/dired-x-tests.el
@@ -58,8 +58,9 @@
("\\.jpe?g\\'" "xloadimage"))))
(should (equal (dired-guess-default '("/tmp/foo.png")) "display"))
(should (equal (dired-guess-default '("/tmp/foo.gif"))
- '("display" "xloadimage" "feh")))))
-
+ '("display" "xloadimage" "feh")))
+ (should (equal (dired-guess-default '("/tmp/foo.png" "/tmp/foo.txt"))
+ nil))))
(provide 'dired-x-tests)
;; dired-x-tests.el ends here
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- master bc0aca0: Fix dired-guess-default logic after previous change,
Lars Ingebrigtsen <=