Commit 2a3bd679 authored by Paul Eggert's avatar Paul Eggert
Browse files

Avoid using obsolete accept-process-output arg

* lisp/gnus/nnheader.el (nnheader-accept-process-output):
* lisp/net/dns.el (dns-query):
* lisp/net/imap.el (imap-wait-for-tag):
* lisp/net/network-stream.el (network-stream-get-response):
* lisp/net/pop3.el (pop3-accept-process-output):
* lisp/obsolete/starttls.el (starttls-negotiate-gnutls)
(starttls-open-stream-gnutls):
* lisp/server.el (server-eval-at):
* lisp/textmodes/ispell.el (ispell-accept-output):
Do not depend on the obsolete milliseconds argument of
accept-process-output.
parent 9fc02ff5
Pipeline #534 failed with stage
in 45 minutes and 59 seconds
......@@ -1042,12 +1042,7 @@ See `find-file-noselect' for the arguments."
;; When changing this function, consider changing `pop3-accept-process-output'
;; as well.
(defun nnheader-accept-process-output (process)
(accept-process-output
process
(truncate nnheader-read-timeout)
(truncate (* (- nnheader-read-timeout
(truncate nnheader-read-timeout))
1000))))
(accept-process-output process nnheader-read-timeout))
(defun nnheader-update-marks-actions (backend-marks actions)
(dolist (action actions)
......
......@@ -432,8 +432,9 @@ If REVERSEP, look up an IP address."
tcp-p))
(while (and (zerop (buffer-size))
(> times 0))
(sit-for (/ step 1000.0))
(accept-process-output process 0 step)
(let ((step-sec (/ step 1000.0)))
(sit-for step-sec)
(accept-process-output process step-sec))
(setq times (- times step)))
(condition-case nil
(delete-process process)
......
......@@ -1929,7 +1929,7 @@ on failure."
;; iteration of the loop above.
(when (and (null imap-continuation)
(< imap-reached-tag tag))
(accept-process-output imap-process 0 0))
(accept-process-output imap-process 0))
(when imap-have-messaged
(message ""))
(and (memq (process-status imap-process) '(open run))
......
......@@ -375,7 +375,7 @@ gnutls-boot (as returned by `gnutls-boot-parameters')."
(goto-char start)
(while (and (memq (process-status stream) '(open run))
(not (re-search-forward end-of-command nil t)))
(accept-process-output stream 0 50)
(accept-process-output stream 0.05)
(goto-char start))
;; Return the data we got back, or nil if the process died.
(unless (= start (point))
......
......@@ -165,12 +165,7 @@ Used for APOP authentication.")
"How long pop3 should wait between checking for the end of output.
Shorter values mean quicker response, but are more CPU intensive.")
(defun pop3-accept-process-output (process)
(accept-process-output
process
(truncate pop3-read-timeout)
(truncate (* (- pop3-read-timeout
(truncate pop3-read-timeout))
1000))))))
(accept-process-output process pop3-read-timeout))))
(defvar pop3-uidl)
;; List of UIDLs of existing messages at present in the server:
......
......@@ -217,7 +217,7 @@ handshake, or nil on failure."
starttls-success nil t))
(setq done-bad (re-search-forward
starttls-failure nil t))))))
(accept-process-output process 1 100)
(accept-process-output process 1.1)
(sit-for 0.1))
(setq info (buffer-substring-no-properties old-max (point-max)))
(delete-region old-max (point-max))
......@@ -251,7 +251,7 @@ handshake, or nil on failure."
(goto-char old-max)
(not (setq done (re-search-forward
starttls-connect nil t)))))
(accept-process-output process 0 100)
(accept-process-output process 0.1)
(sit-for 0.1))
(if done
(with-current-buffer buffer
......
......@@ -1744,7 +1744,7 @@ returns the process ID of the Emacs instance running \"server\"."
(server-quote-arg (format "%S" form))
"\n"))
(while (memq (process-status process) '(open run))
(accept-process-output process 0 10))
(accept-process-output process 0.01))
(goto-char (point-min))
;; If the result is nil, there's nothing in the buffer. If the
;; result is non-nil, it's after "-print ".
......
......@@ -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)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment