* comint.el (comint-replace-by-expanded-history-before-point):

Replace !! with the previous input string literally (Bug#1795).

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f8c718a424b78320d1c8b3c56d67529de5fa69bb..c635f6fc395bb2d2fedddfdbdd68284ccc1bb8c3 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2009-11-03  Chong Yidong  <cyd@stupidchicken.com>
+
+       * comint.el (comint-replace-by-expanded-history-before-point):
+       Replace !! with the previous input string literally (Bug#1795).
+
 2009-11-02  Jay Belanger  <jay.p.belanger@gmail.com>
 
        * calc/calc-forms.el (calc-date-notation): Allow a "blank string"

diff --git a/lisp/comint.el b/lisp/comint.el
index cd7c3f2665443269eca569549b6ed4b3970d8445..5fd6d8f23a901a6c3b5686f58632be5fc2737eff 100644 (file)
--- a/lisp/comint.el
+++ b/lisp/comint.el
@@ -1277,10 +1277,7 @@ 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-args (comint-previous-input-string 0)
-                            (match-beginning 1) (match-end 1))
-               t t)
+              (replace-match (comint-previous-input-string 0) t t)
               (message "History item: previous"))
              ((looking-at
                "!\\??\\({\\(.+\\)}\\|\\(\\sw+\\)\\)\\(:?[0-9^$*-]+\\)?")