diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2019-01-15 14:08:41 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2019-01-15 14:09:11 -0800 |
| commit | 2a3bd6798e9670828f0402079fcc116d6d6b042d (patch) | |
| tree | faed45fcd905138435b9100758f5bcc44e60ec3a /lisp/net | |
| parent | 9fc02ff5ea95c31a8d81eabb5634aa135fcd8786 (diff) | |
| download | emacs-2a3bd6798e9670828f0402079fcc116d6d6b042d.tar.gz emacs-2a3bd6798e9670828f0402079fcc116d6d6b042d.tar.bz2 emacs-2a3bd6798e9670828f0402079fcc116d6d6b042d.zip | |
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.
Diffstat (limited to 'lisp/net')
| -rw-r--r-- | lisp/net/dns.el | 5 | ||||
| -rw-r--r-- | lisp/net/imap.el | 2 | ||||
| -rw-r--r-- | lisp/net/network-stream.el | 2 | ||||
| -rw-r--r-- | lisp/net/pop3.el | 7 |
4 files changed, 6 insertions, 10 deletions
diff --git a/lisp/net/dns.el b/lisp/net/dns.el index beae5c10649..4fa87050e57 100644 --- a/lisp/net/dns.el +++ b/lisp/net/dns.el @@ -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) diff --git a/lisp/net/imap.el b/lisp/net/imap.el index 504900eabe9..0931252c366 100644 --- a/lisp/net/imap.el +++ b/lisp/net/imap.el @@ -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)) diff --git a/lisp/net/network-stream.el b/lisp/net/network-stream.el index 98b20337908..84ba0b85e79 100644 --- a/lisp/net/network-stream.el +++ b/lisp/net/network-stream.el @@ -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)) diff --git a/lisp/net/pop3.el b/lisp/net/pop3.el index bcf56c9ab3f..3aac5b5c45c 100644 --- a/lisp/net/pop3.el +++ b/lisp/net/pop3.el @@ -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: |