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

expansion of !$ and !!:N syntax to pick the indicated word.

Fixes: debbugs:7883

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 380c082d82ea3ee003f8ff552b6683a14ffdb77d..f0c7bbf41e774f9d2028ecb2a85590c15f8242a2 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,11 +1,17 @@
+2011-01-21  Roland McGrath  <roland@frob.com>
+
+       * comint.el (comint-replace-by-expanded-history-before-point): Fix
+       expansion of !$ and !!:N syntax to pick the indicated word (bug#7883).
+
 2011-01-21  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * progmodes/js.el (js--regexp-literal): Count backslashes (bug#7882).
 
 2011-01-21  Jari Aalto  <jari.aalto@cante.net>
 
-       * emacs-lisp/checkdoc.el (checkdoc-this-string-valid-engine): (bug#7705)
-       Assume foo(bar) is a manpage reference rather than some unquoted symbol.
+       * emacs-lisp/checkdoc.el (checkdoc-this-string-valid-engine):
+       Assume foo(bar) is a manpage reference rather than some unquoted
+       symbol (bug#7705).
 
 2011-01-21  Stefan Monnier  <monnier@iro.umontreal.ca>
 

diff --git a/lisp/comint.el b/lisp/comint.el
index 9de10aa6b01f5b3984e27d5aa5fce2306dece071..e7c9c3860987fafc38a3e2585948fecb88a8aa6b 100644 (file)
--- a/lisp/comint.el
+++ b/lisp/comint.el
@@ -1292,7 +1292,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^$*-]+\\)?")