[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master 50a2ccd: Prompt default extension in dired-mark-ext
From: |
Juri Linkov |
Subject: |
[Emacs-diffs] master 50a2ccd: Prompt default extension in dired-mark-extension |
Date: |
Mon, 27 Feb 2017 17:42:07 -0500 (EST) |
branch: master
commit 50a2ccd87ec6d1b275f3906cec4ccc28be05c589
Author: Chunyang Xu <address@hidden>
Commit: Juri Linkov <address@hidden>
Prompt default extension in dired-mark-extension
* lisp/dired-x.el (dired-mark-extension): Prompt default extension
based on extension of file at point. (Bug#25578)
Copyright-paperwork-exempt: yes
---
lisp/dired-x.el | 39 +++++++++++++++++++++++----------------
1 file changed, 23 insertions(+), 16 deletions(-)
diff --git a/lisp/dired-x.el b/lisp/dired-x.el
index 86c9537..6c8fb0e 100644
--- a/lisp/dired-x.el
+++ b/lisp/dired-x.el
@@ -342,22 +342,29 @@ Interactively, ask for EXTENSION.
Prefixed with one C-u, unmark files instead.
Prefixed with two C-u's, prompt for MARKER-CHAR and mark files with it."
(interactive
- (let ((suffix
- (read-string (format "%s extension: "
- (if (equal current-prefix-arg '(4))
- "UNmarking"
- "Marking"))))
- (marker
- (pcase current-prefix-arg
- ('(4) ?\s)
- ('(16)
- (let* ((dflt (char-to-string dired-marker-char))
- (input (read-string
- (format
- "Marker character to use (default %s): " dflt)
- nil nil dflt)))
- (aref input 0)))
- (_ dired-marker-char))))
+ (let* ((default
+ (let ((file (dired-get-filename nil t)))
+ (when file
+ (file-name-extension file))))
+ (suffix
+ (read-string (format "%s extension%s: "
+ (if (equal current-prefix-arg '(4))
+ "UNmarking"
+ "Marking")
+ (if default
+ (format " (default %s)" default)
+ "")) nil nil default))
+ (marker
+ (pcase current-prefix-arg
+ ('(4) ?\s)
+ ('(16)
+ (let* ((dflt (char-to-string dired-marker-char))
+ (input (read-string
+ (format
+ "Marker character to use (default %s): " dflt)
+ nil nil dflt)))
+ (aref input 0)))
+ (_ dired-marker-char))))
(list suffix marker)))
(or (listp extension)
(setq extension (list extension)))
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] master 50a2ccd: Prompt default extension in dired-mark-extension,
Juri Linkov <=