[Emacs-diffs] trunk r113115: * comint.el (comint-redirect-results-list-from-process): Fix

[Leo Liu]

------------------------------------------------------------
revno: 113115
revision-id: address@hidden
parent: address@hidden
committer: Leo Liu <address@hidden>
branch nick: trunk
timestamp: Fri 2013-06-21 17:37:04 +0800
message:
  * comint.el (comint-redirect-results-list-from-process): Fix
  infinite loop.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/comint.el                 comint.el-20091113204419-o5vbwnq5f7feedwu-149

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-06-21 07:52:47 +0000
+++ b/lisp/ChangeLog    2013-06-21 09:37:04 +0000
@@ -1,3 +1,8 @@
+2013-06-21  Leo Liu  <address@hidden>
+
+       * comint.el (comint-redirect-results-list-from-process): Fix
+       infinite loop.
+
 2013-06-21  Lars Magne Ingebrigtsen  <address@hidden>
 
        * net/eww.el (eww-update-header-line-format): Quote % characters.

=== modified file 'lisp/comint.el'
--- a/lisp/comint.el    2013-06-21 01:21:15 +0000
+++ b/lisp/comint.el    2013-06-21 09:37:04 +0000
@@ -3733,12 +3733,13 @@
       ;; Skip past the command, if it was echoed
       (and (looking-at command)
           (forward-line))
-      (while (re-search-forward regexp nil t)
+      (while (and (not (eobp))
+                 (re-search-forward regexp nil t))
        (push (buffer-substring-no-properties
                (match-beginning regexp-group)
                (match-end regexp-group))
               results))
-      results)))
+      (nreverse results))))
 
 ;; Converting process modes to use comint mode
 ;; ===========================================================================