Commit ba28d947 authored by Peter Liljenberg's avatar Peter Liljenberg
Browse files

Fixade accept-process-output så man inte väntar mer än nödvändigt,

utan att behöva använda lyskom-accept-process-output.
parent 106e9220
......@@ -127,7 +127,8 @@ invalid-value until a filter action has been selected.")
;; Block until done
;;
(while (eq lyskom-filter-hack 'invalid-value)
(accept-process-output nil lyskom-apo-timeout-s lyskom-apo-timeout-ms))
(accept-process-output lyskom-proc
lyskom-apo-timeout-s lyskom-apo-timeout-ms))
lyskom-filter-hack)))
(defun lyskom-filter-text-p-2 (text-stat)
......
......@@ -1811,8 +1811,8 @@ If optional argument NOCHANGE is non-nil then the list wont be altered."
(defun lyskom-wait-for-membership ()
"If the full membership hase been read do nothing. Else give a message and
wait for it to be prefetched."
"Give a message and wait for it to be prefetched.
If the full membership hase been read do nothing."
(let ((total (pers-stat->no-of-confs (blocking-do 'get-pers-stat
lyskom-pers-no))))
(while (not (lyskom-membership-is-read))
......@@ -1820,7 +1820,7 @@ wait for it to be prefetched."
lyskom-membership-is-read
total)
(sit-for 0)
(lyskom-accept-process-output))))
(accept-process-output lyskom-proc 1))))
(defun lyskom-prefetch-all-confs ()
......@@ -2135,7 +2135,7 @@ If MEMBERSHIPs prioriy is 0, it always returns nil."
; (sit-for 0) ; Why? [Doesn't work in XEmacs 19.14]
; (setq lyskom-apo-timeout-log
; (cons lyskom-apo-timeout lyskom-apo-timeout-log))
(lyskom-reset-apo-timeout) ; Reset accept-process-output timeout
; (lyskom-reset-apo-timeout) ; Reset accept-process-output timeout
(let ((old-match-data (match-data))
;; lyskom-filter-old-buffer is also changed when starting to edit
;; in function lyskom-edit-text.
......
......@@ -141,7 +141,8 @@ Value returned is always nil."
(while (and (eq lyskom-multiple-blocking-return 'not-yet-gotten)
(memq (process-status lyskom-proc) '(open run))
(not lyskom-quit-flag))
(accept-process-output nil lyskom-apo-timeout-s lyskom-apo-timeout-ms))
(accept-process-output lyskom-proc
lyskom-apo-timeout-s lyskom-apo-timeout-ms))
(if lyskom-quit-flag
(progn
(setq lyskom-quit-flag nil)
......
......@@ -868,8 +868,8 @@ Args: KOM-QUEUE HANDLER SESSION-NO &rest DATA"
(defun blocking-do (command &rest data)
"Does the COMMAND agains the lyskom-server and returns the result.
COMMAND is one lyskom-command \(like the initiate-* but the initiate- is
stripped.
COMMAND is one lyskom-command \(like the initiate-* but the initiate- is
stripped. DATA is the args to command.
The cache is consulted when command is get-conf-stat, get-pers-stat
or get-text-stat."
;; Here we could check if lyskom-blocking-return is non-nil, in
......@@ -891,7 +891,7 @@ or get-text-stat."
(memq (process-status lyskom-proc) '(open run))
;; The following test should probably be removed
(not lyskom-quit-flag))
(lyskom-accept-process-output))
(accept-process-output lyskom-proc 1))
(if (or lyskom-quit-flag quit-flag)
(signal 'quit nil))
(setq lyskom-quit-flag nil)
......
No preview for this file type
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