* comint.el (comint-previous-matching-input-from-input): Retain point.

Fixes: debbugs:13404

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3a86fff5e5013150f63390f842458c9f6e2bde6e..126f10ae79b36f958eec397c24b020c7a510dfb8 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2013-12-18  Le Wang  <l26wang@gmail.com>
+
+       * comint.el (comint-previous-matching-input-from-input): Retain
+       point (Bug#13404).
+
 2013-12-18  Chong Yidong  <cyd@gnu.org>
 
        * simple.el (append-next-kill): Doc fix (Bug#15995, Bug#16016).

diff --git a/lisp/comint.el b/lisp/comint.el
index e7dff585b68cf025d80860b2b4923219bda41af1..5cdec45650d4c5efeaa2ab53cb569b620bd0d43e 100644 (file)
--- a/lisp/comint.el
+++ b/lisp/comint.el
@@ -1210,8 +1210,9 @@ If N is negative, find the previous or Nth previous match."
 With prefix argument N, search for Nth previous match.
 If N is negative, search forwards for the -Nth following match."
   (interactive "p")
-  (if (not (memq last-command '(comint-previous-matching-input-from-input
-                               comint-next-matching-input-from-input)))
+  (let ((opoint (point)))
+    (unless (memq last-command '(comint-previous-matching-input-from-input
+                                comint-next-matching-input-from-input))
       ;; Starting a new search
       (setq comint-matching-input-from-input-string
            (buffer-substring
@@ -1219,9 +1220,10 @@ If N is negative, search forwards for the -Nth following match."
                 (process-mark (get-buffer-process (current-buffer))))
             (point))
            comint-input-ring-index nil))
-  (comint-previous-matching-input
-   (concat "^" (regexp-quote comint-matching-input-from-input-string))
-   n))
+    (comint-previous-matching-input
+     (concat "^" (regexp-quote comint-matching-input-from-input-string))
+     n)
+    (goto-char opoint)))
 
 (defun comint-next-matching-input-from-input (n)
   "Search forwards through input history for match for current input.