diff options
| author | Lars Ingebrigtsen | 2019-07-26 11:12:03 +0200 |
|---|---|---|
| committer | Lars Ingebrigtsen | 2019-07-26 11:12:03 +0200 |
| commit | 048bdc2740fbd8eb1378437d909d44db89c48ec1 (patch) | |
| tree | 5685a7376612f719de89575cac206f587cf1e15c | |
| parent | 64b469f6ae8173116ec948ac43cd44efe4b5a221 (diff) | |
| download | emacs-048bdc2740fbd8eb1378437d909d44db89c48ec1.tar.gz emacs-048bdc2740fbd8eb1378437d909d44db89c48ec1.zip | |
Tweak prompt when symlinking in dired
* lisp/dired-aux.el (dired-do-create-files): Fix prompt when
sym/hardlinking (bug#26870).
| -rw-r--r-- | lisp/dired-aux.el | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/lisp/dired-aux.el b/lisp/dired-aux.el index 09850198ca5..30a941c7bb6 100644 --- a/lisp/dired-aux.el +++ b/lisp/dired-aux.el | |||
| @@ -1898,7 +1898,14 @@ Optional arg HOW-TO determines how to treat the target. | |||
| 1898 | (set (make-local-variable 'minibuffer-default-add-function) nil) | 1898 | (set (make-local-variable 'minibuffer-default-add-function) nil) |
| 1899 | (setq minibuffer-default defaults)) | 1899 | (setq minibuffer-default defaults)) |
| 1900 | (dired-mark-read-file-name | 1900 | (dired-mark-read-file-name |
| 1901 | (concat (if dired-one-file op1 operation) " %s to: ") | 1901 | (format "%s %%s %s: " |
| 1902 | (if dired-one-file op1 operation) | ||
| 1903 | (if (memq op-symbol '(symlink hardlink)) | ||
| 1904 | ;; Linking operations create links | ||
| 1905 | ;; from the prompted file name; the | ||
| 1906 | ;; other operations copy (etc) to the | ||
| 1907 | ;; prompted file name. | ||
| 1908 | "from" "to")) | ||
| 1902 | target-dir op-symbol arg rfn-list default)))) | 1909 | target-dir op-symbol arg rfn-list default)))) |
| 1903 | (into-dir | 1910 | (into-dir |
| 1904 | (progn | 1911 | (progn |