Merge from emacs-23

1 files changed, 3 insertions, 1 deletions

diff --git a/lisp/comint.el b/lisp/comint.el
index da722002c20..1912cdcfc44 100644
--- a/lisp/comint.el
+++ b/lisp/comint.el
@@ -1294,7 +1294,9 @@ than the logical beginning of line."
                    (message "Relative reference exceeds input history size"))))
               ((or (looking-at "!!?:?\\([0-9^$*-]+\\)") (looking-at "!!"))
                ;; Just a number of args from the previous input line.
-               (replace-match (comint-previous-input-string 0) t t)
+               (replace-match (comint-args (comint-previous-input-string 0)
+                                           (match-beginning 1) (match-end 1))
+                              t t)
                (message "History item: previous"))
               ((looking-at
                 "!\\??\\({\\(.+\\)}\\|\\(\\sw+\\)\\)\\(:?[0-9^$*-]+\\)?")