1 files changed, 6 insertions, 2 deletions

diff --git a/lisp/textmodes/ispell.el b/lisp/textmodes/ispell.el
index 22047598b26..418901dae48 100644
--- a/lisp/textmodes/ispell.el
+++ b/lisp/textmodes/ispell.el
@@ -1782,11 +1782,15 @@ You can set this variable in hooks in your init file -- eg:
 
 
 (defun ispell-accept-output (&optional timeout-secs timeout-msecs)
-  "Wait for output from Ispell process, or TIMEOUT-SECS and TIMEOUT-MSECS.
+  "Wait for output from Ispell process, or for TIMEOUT-SECS + TIMEOUT-MSECS.
+\(The TIMEOUT-MSECS argument is obsolete and should be avoided.)
 If asynchronous subprocesses are not supported, call function `ispell-filter'
 and pass it the output of the last Ispell invocation."
   (if ispell-async-processp
-      (accept-process-output ispell-process timeout-secs timeout-msecs)
+      (let ((timeout (if timeout-msecs
+                         (+ (or timeout-secs 0) (/ timeout-msecs 1000.0))
+                       timeout-secs)))
+        (accept-process-output ispell-process timeout))
     (if (null ispell-process)
         (error "No Ispell process to read output from!")
       (let ((buf ispell-output-buffer)