[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[nongnu] elpa/helm 440b7da9be 4/4: Rename helm-ff--local-directory-files
From: |
ELPA Syncer |
Subject: |
[nongnu] elpa/helm 440b7da9be 4/4: Rename helm-ff--local-directory-files and move it |
Date: |
Sun, 7 Apr 2024 12:59:59 -0400 (EDT) |
branch: elpa/helm
commit 440b7da9be9ad5c5b00458696f9a8b0a2a1b4cbe
Author: Thierry Volpiatto <thievol@posteo.net>
Commit: Thierry Volpiatto <thievol@posteo.net>
Rename helm-ff--local-directory-files and move it
to helm-lib. This should fix user installation/upgrade problems
(#2661) with package.el.
---
helm-files.el | 11 +++--------
helm-lib.el | 5 +++++
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/helm-files.el b/helm-files.el
index 5c1f220a41..9ebf12ee81 100644
--- a/helm-files.el
+++ b/helm-files.el
@@ -3624,23 +3624,18 @@ SEL argument is only here for debugging purpose, it
default to
(ignore-errors
(funcall helm-list-directory-function directory sort-method)))
((memq helm-ff-initial-sort-method '(newest size))
- (sort (helm-ff--local-directory-files
+ (sort (helm-local-directory-files
directory t directory-files-no-dot-files-regexp)
sort-method))
((eq helm-ff-initial-sort-method 'ext)
(funcall sort-method
- (helm-ff--local-directory-files
+ (helm-local-directory-files
directory t directory-files-no-dot-files-regexp)
#'file-name-extension
(or sel (helm-get-selection) "")))
- (t (helm-ff--local-directory-files
+ (t (helm-local-directory-files
directory t directory-files-no-dot-files-regexp)))))
-(defun helm-ff--local-directory-files (directory &optional full match nosort
count)
- "Run `directory-files' without tramp file name handlers."
- (without-remote-files
- (directory-files directory full match nosort count)))
-
(defsubst helm-ff-file-larger-that-file-p (f1 f2)
(let ((attr1 (file-attributes f1))
(attr2 (file-attributes f2)))
diff --git a/helm-lib.el b/helm-lib.el
index 2b95d72e0e..fac01ac441 100644
--- a/helm-lib.el
+++ b/helm-lib.el
@@ -1825,6 +1825,11 @@ Directories expansion is not supported."
(if (string= desc "")
"Not documented"
(replace-regexp-in-string "\n" "" desc))))
+
+(defun helm-local-directory-files (directory &optional full match nosort count)
+ "Run `directory-files' without tramp file name handlers."
+ (without-remote-files
+ (directory-files directory full match nosort count)))
;;; helm internals
;;