auto upstream

3 files changed, 8 insertions, 2 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0517a66916f..c291bba0f19 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2012-12-15  Christopher Schmidt  <christopher@ch.ristopher.com>
+
+        * dired-x.el (dired-guess-shell-command): Put colon at the end of
+        the prompt.  (Bug#13045)
+
 2012-12-14  Glenn Morris  <rgm@gnu.org>
 
         * 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'."
     (if (null default)
         ;; Nothing to guess
         (read-shell-command prompt nil 'dired-shell-command-history)
+      (setq prompt (replace-regexp-in-string ": $" " " prompt))
       (if (listp default)
           ;; More than one guess
           (setq default-list default
@@ -1124,7 +1125,7 @@ See `dired-guess-shell-alist-user'."
         ;; Just one guess
         (setq default-list (list default)))
       ;; Put the first guess in the prompt but not in the initial value.
-      (setq prompt (concat prompt (format "[%s] " default)))
+      (setq prompt (concat prompt (format "[%s]: " default)))
       ;; All guesses can be retrieved with M-n
       (setq val (read-shell-command prompt nil
                                     'dired-shell-command-history
diff --git a/lisp/dired.el b/lisp/dired.el
index 1d6c667e1dd..93f302329e3 100644
--- a/lisp/dired.el
+++ b/lisp/dired.el
@@ -4295,7 +4295,7 @@ instead.
 ;;;***
 
 ;;;### (autoloads (dired-do-relsymlink dired-jump-other-window dired-jump)
-;;;;;;  "dired-x" "dired-x.el" "a4e6844421c2c5e6fde90e959fbcc26f")
+;;;;;;  "dired-x" "dired-x.el" "a0a769bf895afcbb6d0e05169ef81923")
 ;;; Generated autoloads from dired-x.el
 
 (autoload 'dired-jump "dired-x" "\