1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80
|
From: Xiyue Deng <manphiz@gmail.com>
Date: Thu, 29 May 2025 15:11:17 -0700
Subject: Temporary drop dependency on wfnames
- It's currently too late in the Trixie release cycle and
emacs-wfnames is still in ITP stage.
- This patch should be removed once emacs-wfnames enters the archive.
Forwarded: not-needed
---
helm-files.el | 21 +++++++++++----------
helm.el | 2 +-
2 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/helm-files.el b/helm-files.el
index a739b88..687cedb 100644
--- a/helm-files.el
+++ b/helm-files.el
@@ -791,7 +791,7 @@ when moving out of directory when non nil."
"History source in *eshell-command-on-file appears on top when non nil."
:type 'boolean)
-(defcustom helm-ff-edit-marked-files-fn #'helm-ff-wfnames
+(defcustom helm-ff-edit-marked-files-fn #'helm-marked-files-in-dired
"A function to edit filenames in a special buffer.
By default `wfnames' package is used to avoid wdired which
@@ -799,8 +799,8 @@ doesn't always work with all emacs versions and also is quite
clumsy about default-directory among other things. If you still
want to use it, helm is still providing
`helm-marked-files-in-dired'."
- :type '(choice (function :tag "Use Wfnames package to edit filenames."
- helm-ff-wfnames)
+ :type '(choice ;; (function :tag "Use Wfnames package to edit filenames."
+ ;; helm-ff-wfnames)
(function :tag "Use Wdired package to edit filenames."
helm-marked-files-in-dired)))
@@ -813,7 +813,8 @@ want to use it, helm is still providing
(lambda ()
(helm-acase helm-ff-edit-marked-files-fn
(helm-marked-files-in-dired "Edit filenames in Wdired `C-x C-q'")
- (helm-ff-wfnames "Edit filenames in Wfnames `C-x C-q'")))
+ ;;(helm-ff-wfnames "Edit filenames in Wfnames `C-x C-q'")
+ ))
'helm-ff-edit-marked-files
"Query replace contents on marked `M-%'" 'helm-ff-query-replace
"Query replace regexp contents on marked `C-M-%'" 'helm-ff-query-replace-regexp
@@ -3335,12 +3336,12 @@ editing absolute fnames in previous Emacs versions."
(when (or helm-current-prefix-arg current-prefix-arg)
(call-interactively 'wdired-change-to-wdired-mode))))))
-(defun helm-ff-wfnames (_candidate)
- "Edit marked fnames with `Wfnames' package."
- (cl-assert (require 'wfnames nil t) nil "Wfnames package not found")
- (let ((marked (helm-marked-candidates :with-wildcard t)))
- (wfnames-setup-buffer
- marked #'switch-to-buffer (buffer-live-p (get-buffer wfnames-buffer)))))
+;; (defun helm-ff-wfnames (_candidate)
+;; "Edit marked fnames with `Wfnames' package."
+;; (cl-assert (require 'wfnames nil t) nil "Wfnames package not found")
+;; (let ((marked (helm-marked-candidates :with-wildcard t)))
+;; (wfnames-setup-buffer
+;; marked #'switch-to-buffer (buffer-live-p (get-buffer wfnames-buffer)))))
(defun helm-ff-edit-marked-files (candidate)
"Edit marked files with `helm-ff-edit-marked-files-fn' fn."
diff --git a/helm.el b/helm.el
index 7453215..0089eb2 100644
--- a/helm.el
+++ b/helm.el
@@ -13,7 +13,7 @@
;; Author: Thierry Volpiatto <thievol@posteo.net>
;; Version: 4.0.6
;; URL: https://emacs-helm.github.io/helm/
-;; Package-Requires: ((helm-core "4.0.6") (wfnames "1.2"))
+;; Package-Requires: ((helm-core "4.0.6"))
;; Keywords: helm, convenience, files, buffers, grep, completion, lisp, matching, tools, help
;; This program is free software; you can redistribute it and/or modify
|