Commit 1097cc30 authored by David Byers's avatar David Byers
Browse files

Fixed bug 1132. Fixed bug 1140 and similar problems. Minor bug fixes.

Detailed changes:
> 2003-11-17  David Byers  <byers@lysator.liu.se>
>
> 	Fix bug 1132:
> 	* commands2.el (lyskom-list-new-conferences): Made this function
> 	asynchronous. Use lyskom-get-conf-stat since there's a good
> 	chance, shortly after release at any rate, that this command will
> 	cause an explosion of get-conf-stats anyway (when the client gets
> 	the conf-stat in order to display the presentation status).
>
> 2003-11-14  David Byers  <byers@lysator.liu.se>
>
> 	Fix bug 1140:
> 	* vars.el.in (kom-pick-text-no-strategy-alist): Added items to
> 	this list corresponding to commands that have non-standard
> 	defaults, since these were ignored.
>
> 	* faqs.el (kom-add-faq): Don't pass DEFAULT to
> 	lyskom-read-text-no-prefix-arg (the default made little sense
> 	anyway).
> 	(kom-add-server-faq): Same here.
>
> 	* commands1.el (kom-set-presentation): Don't pass DEFAULT to
> 	lyskom-read-text-no-prefix-arg (the default made little sense
> 	anyway).
> 	(kom-set-motd-text): Same here.
>
> 2003-09-21  David Byers  <byers@lysator.liu.se>
>
> 	* commands1.el (lyskom-read-mark-type): Improve handling of empty
> 	string entered as mark type.
>
> 2003-09-17  David Byers  <byers@lysator.liu.se>
>
> 	* cache.el (lyskom-tell-server): Never, ever, send nil to
> 	change-what-i-am-doing since this causes a protocol error.
>
parent f1560739
2003-11-17 David Byers <byers@lysator.liu.se>
Fix bug 1132:
* commands2.el (lyskom-list-new-conferences): Made this function
asynchronous. Use lyskom-get-conf-stat since there's a good
chance, shortly after release at any rate, that this command will
cause an explosion of get-conf-stats anyway (when the client gets
the conf-stat in order to display the presentation status).
2003-11-14 David Byers <byers@lysator.liu.se>
Fix bug 1140:
* vars.el.in (kom-pick-text-no-strategy-alist): Added items to
this list corresponding to commands that have non-standard
defaults, since these were ignored.
* faqs.el (kom-add-faq): Don't pass DEFAULT to
lyskom-read-text-no-prefix-arg (the default made little sense
anyway).
(kom-add-server-faq): Same here.
* commands1.el (kom-set-presentation): Don't pass DEFAULT to
lyskom-read-text-no-prefix-arg (the default made little sense
anyway).
(kom-set-motd-text): Same here.
2003-09-21 David Byers <byers@lysator.liu.se>
* commands1.el (lyskom-read-mark-type): Improve handling of empty
string entered as mark type.
2003-09-17 David Byers <byers@lysator.liu.se>
* cache.el (lyskom-tell-server): Never, ever, send nil to
change-what-i-am-doing since this causes a protocol error.
2003-10-26 Per Cederqvist <ceder@ceder.dyndns.org> 2003-10-26 Per Cederqvist <ceder@ceder.dyndns.org>
* lyskom-rest.el (kom-mark-unread): Fixed typos in doc string. * lyskom-rest.el (kom-mark-unread): Fixed typos in doc string.
......
...@@ -313,6 +313,6 @@ CACHE is the name of the variable that points to the cache." ...@@ -313,6 +313,6 @@ CACHE is the name of the variable that points to the cache."
((equal string lyskom-what-i-am-doing)) ((equal string lyskom-what-i-am-doing))
(t (t
(setq lyskom-what-i-am-doing string) (setq lyskom-what-i-am-doing string)
(initiate-change-what-i-am-doing 'background nil string)))))) (initiate-change-what-i-am-doing 'background nil (or string "")))))))
(provide 'lyskom-cache) (provide 'lyskom-cache)
...@@ -2289,11 +2289,11 @@ exist." ...@@ -2289,11 +2289,11 @@ exist."
(setq mark "")) (setq mark ""))
(cond (cond
;; Default completion. ;; Default completion.
((and nildefault ((and nildefault (null mark))
(stringp mark)
(string= mark ""))
(setq mark-type 'default)) (setq mark-type 'default))
((null mark))
;; Correct completion. ;; Correct completion.
(mark-assoc (mark-assoc
(setq mark-type (cdr mark-assoc))) (setq mark-type (cdr mark-assoc)))
...@@ -2326,8 +2326,7 @@ exist." ...@@ -2326,8 +2326,7 @@ exist."
(setq mark-type new-mark-type)))) (setq mark-type new-mark-type))))
;; Incorrect completion. ;; Incorrect completion.
(t (t (lyskom-insert 'erroneous-mark)))))
(lyskom-insert 'erroneous-mark)))))
(if (eq mark-type 'default) (if (eq mark-type 'default)
nil nil
......
...@@ -3542,9 +3542,7 @@ was given." ...@@ -3542,9 +3542,7 @@ was given."
"List conferences created since the last time this command "List conferences created since the last time this command
was given." was given."
(interactive) (interactive)
(let* ((result (make-collector)) (let* ((var (symbol-value varsym))
(var (symbol-value varsym))
(count 0)
(conf-no (or (car var) 1)) (conf-no (or (car var) 1))
(last-conf-no (blocking-do 'first-unused-conf-no)) (last-conf-no (blocking-do 'first-unused-conf-no))
(time-string (condition-case nil (time-string (condition-case nil
...@@ -3552,37 +3550,43 @@ was given." ...@@ -3552,37 +3550,43 @@ was given."
'date-and-time (cdr var))) 'date-and-time (cdr var)))
(error nil)))) (error nil))))
(cond ((null last-conf-no) (if (null last-conf-no)
(lyskom-format-insert 'no-support-in-server)) (lyskom-format-insert 'no-support-in-server))
((>= conf-no last-conf-no) (let ((count (cons 0 (make-marker))))
(lyskom-format-insert 'no-new-conferences (while (< conf-no last-conf-no)
time-string (lyskom-get-string obj))) (initiate-get-conf-stat
(t 'main
(lyskom-format-insert 'new-conferences-since (lambda (conf filter count time-string)
time-string (lyskom-get-string obj)) (when (and conf (funcall filter conf))
(while (< conf-no last-conf-no) (when (eq (car count) 0)
(initiate-get-uconf-stat 'main (lyskom-format-insert 'new-conferences-since
(lambda (val result) time-string (lyskom-get-string obj)))
(and val (collector-push val result))) (rplaca count (1+ (car count)))
conf-no result) (lyskom-format-insert "%5#1m %#2c %#1M\n"
(setq conf-no (1+ conf-no))) conf
(lyskom-wait-queue 'main) (lyskom-list-conf-membership-char
(lyskom-traverse conf (nreverse (collector->value result)) (uconf-stat->conf-no conf)))
(when (funcall filter conf) (set-marker (cdr count) (point))))
(setq count (1+ count)) conf-no filter count time-string)
(lyskom-format-insert "%5#1m %#2c %#1M\n" (setq conf-no (1+ conf-no)))
conf (lyskom-wait-queue 'main)
(lyskom-list-conf-membership-char (when (marker-position (cdr count))
(uconf-stat->conf-no conf))))) (goto-char (cdr count)))
(when (or kom-auto-confirm-new-conferences
(lyskom-j-or-n-p (lyskom-format 'mark-confs-as-known (cond ((eq 0 (car count))
(lyskom-get-string obj) (lyskom-format-insert 'no-new-conferences
count))) time-string (lyskom-get-string obj)))
(set varsym (cons conf-no (lyskom-current-client-time)))
(lyskom-save-options lyskom-buffer (t
nil (when (or kom-auto-confirm-new-conferences
nil (lyskom-j-or-n-p (lyskom-format 'mark-confs-as-known
nil)))))) (lyskom-get-string obj)
(car count))))
(set varsym (cons conf-no (lyskom-current-client-time)))
(lyskom-save-options lyskom-buffer
nil
nil
nil)))))))
......
...@@ -85,7 +85,7 @@ This command accepts text number prefix arguments \(see ...@@ -85,7 +85,7 @@ This command accepts text number prefix arguments \(see
`lyskom-read-text-no-prefix-arg')." `lyskom-read-text-no-prefix-arg')."
(interactive (list (lyskom-read-conf-no 'conf-to-add-faq (interactive (list (lyskom-read-conf-no 'conf-to-add-faq
'(conf pers) nil nil t) '(conf pers) nil nil t)
(lyskom-read-text-no-prefix-arg 'text-to-add-as-faq nil 'last-seen-written))) (lyskom-read-text-no-prefix-arg 'text-to-add-as-faq)))
(lyskom-add-faq conf-no text-no)) (lyskom-add-faq conf-no text-no))
...@@ -97,7 +97,7 @@ a conference that doesn't have one, or change an existing FAQ, use ...@@ -97,7 +97,7 @@ a conference that doesn't have one, or change an existing FAQ, use
This command accepts text number prefix arguments \(see This command accepts text number prefix arguments \(see
`lyskom-read-text-no-prefix-arg')." `lyskom-read-text-no-prefix-arg')."
(interactive (list (lyskom-read-text-no-prefix-arg 'text-to-add-as-faq nil 'last-seen-written))) (interactive (list (lyskom-read-text-no-prefix-arg 'text-to-add-as-faq)))
(lyskom-add-faq nil text-no)) (lyskom-add-faq nil text-no))
......
...@@ -514,6 +514,14 @@ The format of this variable may change in the future. ...@@ -514,6 +514,14 @@ The format of this variable may change in the future.
(nil . lyskom-maybe-get-commented-text))) (nil . lyskom-maybe-get-commented-text)))
(kom-sub-footnote . ((t . lyskom-maybe-get-footnoted-text) (kom-sub-footnote . ((t . lyskom-maybe-get-footnoted-text)
(nil . lyskom-maybe-get-footnoted-text))) (nil . lyskom-maybe-get-footnoted-text)))
(kom-write-footnote . ((t . lyskom-get-last-written-or-read-by-me)
(nil . lyskom-get-last-written-or-read-by-me)))
(kom-add-no-comments . ((t . lyskom-get-last-written-or-read-by-me)
(nil . lyskom-get-last-written-or-read-by-me)))
(kom-add-private-answer . ((t . lyskom-get-last-written-or-read-by-me)
(nil . lyskom-get-last-written-or-read-by-me)))
(kom-add-request-confirm . ((t . lyskom-get-last-written-or-read-by-me)
(nil . lyskom-get-last-written-or-read-by-me)))
(t . ((t . lyskom-get-text-at-point) ; default for prompts (t . ((t . lyskom-get-text-at-point) ; default for prompts
(nil . lyskom-get-text-at-point) ; no prefix arg (nil . lyskom-get-text-at-point) ; no prefix arg
(0 . lyskom-prompt-for-text-no) (0 . lyskom-prompt-for-text-no)
......
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