aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/comint.el4
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 @@
12013-06-21 Leo Liu <sdl.web@gmail.com>
2
3 * comint.el (comint-redirect-results-list-from-process): Fix
4 random delay. (Bug#14681)
5
12013-06-21 Juanma Barranquero <lekktu@gmail.com> 62013-06-21 Juanma Barranquero <lekktu@gmail.com>
2 7
3 * profiler.el (profiler-format-number): Use log, not log10. 8 * 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."
3725 output-buffer process nil t) 3725 output-buffer process nil t)
3726 ;; Wait for the process to complete 3726 ;; Wait for the process to complete
3727 (set-buffer (process-buffer process)) 3727 (set-buffer (process-buffer process))
3728 (while (null comint-redirect-completed) 3728 (while (and (null comint-redirect-completed)
3729 (accept-process-output nil 1)) 3729 (accept-process-output process)))
3730 ;; Collect the output 3730 ;; Collect the output
3731 (set-buffer output-buffer) 3731 (set-buffer output-buffer)
3732 (goto-char (point-min)) 3732 (goto-char (point-min))