From: Roland McGrath Date: Fri, 21 Jan 2011 20:56:24 +0000 (-0500) Subject: * lisp/comint.el (comint-replace-by-expanded-history-before-point): Fix X-Git-Tag: emacs-pretest-23.2.93~48 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=6e1dbaa90f509915b6282dc61a041e434e41cf29;p=emacs.git * 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 380c082d82e..f0c7bbf41e7 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,11 +1,17 @@ +2011-01-21 Roland McGrath + + * 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 * progmodes/js.el (js--regexp-literal): Count backslashes (bug#7882). 2011-01-21 Jari Aalto - * 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 diff --git a/lisp/comint.el b/lisp/comint.el index 9de10aa6b01..e7c9c386098 100644 --- 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^$*-]+\\)?")