diff options
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/comint.el | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 5811fd1b0b2..e4c67dde1d9 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2013-06-21 Leo Liu <sdl.web@gmail.com> + + * comint.el (comint-redirect-results-list-from-process): Fix + random delay. (Bug#14681) + 2013-06-21 Juanma Barranquero <lekktu@gmail.com> * profiler.el (profiler-format-number): Use log, not log10. diff --git a/lisp/comint.el b/lisp/comint.el index 592f63fa683..c1a1c56f78a 100644 --- a/lisp/comint.el +++ b/lisp/comint.el @@ -3725,8 +3725,8 @@ REGEXP-GROUP is the regular expression group in REGEXP to use." output-buffer process nil t) ;; Wait for the process to complete (set-buffer (process-buffer process)) - (while (null comint-redirect-completed) - (accept-process-output nil 1)) + (while (and (null comint-redirect-completed) + (accept-process-output process))) ;; Collect the output (set-buffer output-buffer) (goto-char (point-min)) |