diff options
Diffstat (limited to 'lisp/wdired.el')
| -rw-r--r-- | lisp/wdired.el | 116 |
1 files changed, 68 insertions, 48 deletions
diff --git a/lisp/wdired.el b/lisp/wdired.el index f6d2b37904a..106d57174d5 100644 --- a/lisp/wdired.el +++ b/lisp/wdired.el @@ -155,26 +155,30 @@ nonexistent directory will fail." :version "26.1" :type 'boolean) -(defvar wdired-mode-map - (let ((map (make-sparse-keymap))) - (define-key map "\C-x\C-s" #'wdired-finish-edit) - (define-key map "\C-c\C-c" #'wdired-finish-edit) - (define-key map "\C-c\C-k" #'wdired-abort-changes) - (define-key map "\C-c\C-[" #'wdired-abort-changes) - (define-key map "\C-x\C-q" #'wdired-exit) - (define-key map "\C-m" #'undefined) - (define-key map "\C-j" #'undefined) - (define-key map "\C-o" #'undefined) - (define-key map [up] #'wdired-previous-line) - (define-key map "\C-p" #'wdired-previous-line) - (define-key map [down] #'wdired-next-line) - (define-key map "\C-n" #'wdired-next-line) - (define-key map [remap upcase-word] #'wdired-upcase-word) - (define-key map [remap capitalize-word] #'wdired-capitalize-word) - (define-key map [remap downcase-word] #'wdired-downcase-word) - (define-key map [remap self-insert-command] #'wdired--self-insert) - map) - "Keymap used in `wdired-mode'.") +(defcustom wdired-search-replace-filenames t + "Non-nil to search and replace in file names only." + :version "29.1" + :type 'boolean) + +(defvar-keymap wdired-mode-map + :doc "Keymap used in `wdired-mode'." + "C-x C-s" #'wdired-finish-edit + "C-c C-c" #'wdired-finish-edit + "C-c C-k" #'wdired-abort-changes + "C-c C-[" #'wdired-abort-changes + "C-x C-q" #'wdired-exit + "RET" #'undefined + "C-j" #'undefined + "C-o" #'undefined + "<up>" #'wdired-previous-line + "C-p" #'wdired-previous-line + "<down>" #'wdired-next-line + "C-n" #'wdired-next-line + "C-(" #'dired-hide-details-mode + "<remap> <upcase-word>" #'wdired-upcase-word + "<remap> <capitalize-word>" #'wdired-capitalize-word + "<remap> <downcase-word>" #'wdired-downcase-word + "<remap> <self-insert-command>" #'wdired--self-insert) (easy-menu-define wdired-mode-menu wdired-mode-map "Menu for `wdired-mode'." @@ -218,6 +222,7 @@ symbolic link targets, and filenames permission." (error "This mode can be enabled only by `wdired-change-to-wdired-mode'")) (put 'wdired-mode 'mode-class 'special) +(declare-function dired-isearch-search-filenames "dired-aux") ;;;###autoload (defun wdired-change-to-wdired-mode () @@ -238,9 +243,16 @@ See `wdired-mode'." (dired-remember-marks (point-min) (point-max))) (setq-local wdired--old-point (point)) (wdired--set-permission-bounds) - (setq-local query-replace-skip-read-only t) - (add-function :after-while (local 'isearch-filter-predicate) - #'wdired-isearch-filter-read-only) + (when wdired-search-replace-filenames + (add-function :around (local 'isearch-search-fun-function) + #'dired-isearch-search-filenames + '((isearch-message-prefix . "filename "))) + (setq-local replace-search-function + (setq-local replace-re-search-function + (funcall isearch-search-fun-function))) + ;; Original dired hook removes dired-isearch-search-filenames that + ;; is needed outside isearch for lazy-highlighting in query-replace. + (remove-hook 'isearch-mode-hook #'dired-isearch-filenames-setup t)) (use-local-map wdired-mode-map) (force-mode-line-update) (setq buffer-read-only nil) @@ -320,11 +332,6 @@ or \\[wdired-abort-changes] to abort changes"))) ;; Is this good enough? Assumes no extra white lines from dired. (put-text-property (1- (point-max)) (point-max) 'read-only t))))))) -(defun wdired-isearch-filter-read-only (beg end) - "Skip matches that have a read-only property." - (not (text-property-not-all (min beg end) (max beg end) - 'read-only nil))) - ;; Protect the buffer so only the filenames can be changed, and put ;; properties so filenames (old and new) can be easily found. (defun wdired--preprocess-files () @@ -439,8 +446,13 @@ non-nil means return old filename." (remove-text-properties (point-min) (point-max) '(front-sticky nil rear-nonsticky nil read-only nil keymap nil))) - (remove-function (local 'isearch-filter-predicate) - #'wdired-isearch-filter-read-only) + (when wdired-search-replace-filenames + (remove-function (local 'isearch-search-fun-function) + #'dired-isearch-search-filenames) + (kill-local-variable 'replace-search-function) + (kill-local-variable 'replace-re-search-function) + ;; Restore dired hook + (add-hook 'isearch-mode-hook #'dired-isearch-filenames-setup nil t)) (use-local-map dired-mode-map) (force-mode-line-update) (setq buffer-read-only t) @@ -509,7 +521,15 @@ non-nil means return old filename." files-renamed)))) (forward-line -1))) (when files-renamed - (setq errors (+ errors (wdired-do-renames files-renamed)))) + (pcase-let ((`(,errs . ,successful-renames) + (wdired-do-renames files-renamed))) + (cl-incf errors errs) + ;; Some of the renames may fail -- in that case, don't mark an + ;; already-existing file with the same name as renamed. + (pcase-dolist (`(,file . _) wdired--old-marks) + (unless (member file successful-renames) + (setq wdired--old-marks + (assoc-delete-all file wdired--old-marks #'equal)))))) ;; We have to be in wdired-mode when wdired-do-renames is executed ;; so that wdired--restore-properties runs, but we have to change ;; back to dired-mode before reverting the buffer to avoid using @@ -554,7 +574,8 @@ non-nil means return old filename." (errors 0) (total (1- (length renames))) (prep (make-progress-reporter "Renaming" 0 total)) - (overwrite (or (not wdired-confirm-overwrite) 1))) + (overwrite (or (not wdired-confirm-overwrite) 1)) + (successful-renames nil)) (while (or renames ;; We've done one round through the renames, we have found ;; some residue, but we also made some progress, so maybe @@ -605,13 +626,15 @@ non-nil means return old filename." (wdired-create-parentdirs file-new)) (dired-rename-file file-ori file-new overwrite)) + (:success + (push file-new successful-renames)) (error (setq errors (1+ errors)) (dired-log "Rename `%s' to `%s' failed:\n%s\n" file-ori file-new err))))))))) (progress-reporter-done prep) - errors)) + (cons errors successful-renames))) (defun wdired-create-parentdirs (file-new) "Create parent directories for FILE-NEW if they don't exist." @@ -872,21 +895,18 @@ Like original function but it skips read-only words." ;; The following code deals with changing the access bits (or ;; permissions) of the files. -(defvar wdired-perm-mode-map - (let ((map (make-sparse-keymap))) - (define-key map " " #'wdired-toggle-bit) - (define-key map "r" #'wdired-set-bit) - (define-key map "w" #'wdired-set-bit) - (define-key map "x" #'wdired-set-bit) - (define-key map "-" #'wdired-set-bit) - (define-key map "S" #'wdired-set-bit) - (define-key map "s" #'wdired-set-bit) - (define-key map "T" #'wdired-set-bit) - (define-key map "t" #'wdired-set-bit) - (define-key map "s" #'wdired-set-bit) - (define-key map "l" #'wdired-set-bit) - (define-key map [mouse-1] #'wdired-mouse-toggle-bit) - map)) +(defvar-keymap wdired-perm-mode-map + "SPC" #'wdired-toggle-bit + "r" #'wdired-set-bit + "w" #'wdired-set-bit + "x" #'wdired-set-bit + "-" #'wdired-set-bit + "S" #'wdired-set-bit + "T" #'wdired-set-bit + "t" #'wdired-set-bit + "s" #'wdired-set-bit + "l" #'wdired-set-bit + "<mouse-1>" #'wdired-mouse-toggle-bit) ;; Put a keymap property to the permission bits of the files, and store the ;; original name and permissions as a property |