[Emacs-diffs] /srv/bzr/emacs/emacs-23 r100391: * lisp/comint.el (comint-replace-by-expanded-history-before-point): Fix

[Stefan Monnier]

------------------------------------------------------------
revno: 100391
author: Roland McGrath <address@hidden>
committer: Stefan Monnier <address@hidden>
branch nick: emacs-23
timestamp: Fri 2011-01-21 15:56:24 -0500
message:
  * lisp/comint.el (comint-replace-by-expanded-history-before-point): Fix
  expansion of !$ and !!:N syntax to pick the indicated word.
modified:
  lisp/ChangeLog
  lisp/comint.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-01-21 20:48:20 +0000
+++ b/lisp/ChangeLog    2011-01-21 20:56:24 +0000
@@ -1,11 +1,17 @@
+2011-01-21  Roland McGrath  <address@hidden>
+
+       * 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  <address@hidden>
 
        * progmodes/js.el (js--regexp-literal): Count backslashes (bug#7882).
 
 2011-01-21  Jari Aalto  <address@hidden>
 
-       * 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  <address@hidden>
 

=== modified file 'lisp/comint.el'
--- a/lisp/comint.el    2011-01-02 23:50:46 +0000
+++ b/lisp/comint.el    2011-01-21 20:56:24 +0000
@@ -1292,7 +1292,9 @@
                   (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^$*-]+\\)?")