aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
authorChristopher Schmidt2012-12-15 14:05:04 +0200
committerJuri Linkov2012-12-15 14:05:04 +0200
commit178fb95dc0f43541296beaf385905a7b626defb8 (patch)
tree0bc1927eaa8e53b66268569d026861c68226b55c /lisp
parent7be7da6c9f065bd2cc0f30f3675116536efefde4 (diff)
downloademacs-178fb95dc0f43541296beaf385905a7b626defb8.tar.gz
emacs-178fb95dc0f43541296beaf385905a7b626defb8.zip
* lisp/dired-x.el (dired-guess-shell-command): Put colon at the end of the prompt.
Fixes: debbugs:13045
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/dired-x.el3
2 files changed, 7 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0517a66916f..c291bba0f19 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12012-12-15 Christopher Schmidt <christopher@ch.ristopher.com>
2
3 * dired-x.el (dired-guess-shell-command): Put colon at the end of
4 the prompt. (Bug#13045)
5
12012-12-14 Glenn Morris <rgm@gnu.org> 62012-12-14 Glenn Morris <rgm@gnu.org>
2 7
3 * emacs-lisp/macroexp.el (macroexp--warn-and-return): 8 * emacs-lisp/macroexp.el (macroexp--warn-and-return):
diff --git a/lisp/dired-x.el b/lisp/dired-x.el
index 1237eef86cf..ece73519686 100644
--- a/lisp/dired-x.el
+++ b/lisp/dired-x.el
@@ -1114,6 +1114,7 @@ See `dired-guess-shell-alist-user'."
1114 (if (null default) 1114 (if (null default)
1115 ;; Nothing to guess 1115 ;; Nothing to guess
1116 (read-shell-command prompt nil 'dired-shell-command-history) 1116 (read-shell-command prompt nil 'dired-shell-command-history)
1117 (setq prompt (replace-regexp-in-string ": $" " " prompt))
1117 (if (listp default) 1118 (if (listp default)
1118 ;; More than one guess 1119 ;; More than one guess
1119 (setq default-list default 1120 (setq default-list default
@@ -1124,7 +1125,7 @@ See `dired-guess-shell-alist-user'."
1124 ;; Just one guess 1125 ;; Just one guess
1125 (setq default-list (list default))) 1126 (setq default-list (list default)))
1126 ;; Put the first guess in the prompt but not in the initial value. 1127 ;; Put the first guess in the prompt but not in the initial value.
1127 (setq prompt (concat prompt (format "[%s] " default))) 1128 (setq prompt (concat prompt (format "[%s]: " default)))
1128 ;; All guesses can be retrieved with M-n 1129 ;; All guesses can be retrieved with M-n
1129 (setq val (read-shell-command prompt nil 1130 (setq val (read-shell-command prompt nil
1130 'dired-shell-command-history 1131 'dired-shell-command-history