Commit 8a92ed5b authored by David Byers's avatar David Byers
Browse files

Fixed bugs 1000, 1006, 1008

Detailed changes:
> 2003-04-05  David Byers  <david.byers@swipnet.se>
>
> 	Fix bug 1006:
> 	* commands2.el (kom-is-person-member-of-conference): Show number
> 	of unread (only when deferred printing is on).
>
> 	* deferred-insert.el (lyskom-defer-insertion): Handle a list as
> 	the arguments for the server call.
>
> 	Fix bug 1000:
> 	* swedish-strings.el: Fix cut-n-paste error.
>
> 	Fix bug 1008:
> 	* commands1.el (lyskom-list-created-conferences-2): Show garb-nice
> 	in listing.
>
parent 5d4625a9
2003-04-05 David Byers <david.byers@swipnet.se>
Fix bug 1006:
* commands2.el (kom-is-person-member-of-conference): Show number
of unread (only when deferred printing is on).
* deferred-insert.el (lyskom-defer-insertion): Handle a list as
the arguments for the server call.
Fix bug 1000:
* swedish-strings.el: Fix cut-n-paste error.
Fix bug 1008:
* commands1.el (lyskom-list-created-conferences-2): Show garb-nice
in listing.
2003-03-16 David Byers <david.byers@swipnet.se>
Fix bug 815:
......
......@@ -1981,7 +1981,7 @@ See `kom-allow-incompleteness'."
(conf-stat->supervisor cs)
(conf-stat->super-conf cs))))
(aset counter 3 (1+ (elt counter 3)))
(lyskom-format-insert "%[%#1@%5#2:m %#3c %4#4s %#5s %#2M%]\n"
(lyskom-format-insert "%5#2m %5#6d %#3c %4#4s %#5s %#2M\n"
(lyskom-default-button 'conf (conf-stat->conf-no cs))
cs
(lyskom-list-conf-membership-char (conf-stat->conf-no cs))
......@@ -1992,7 +1992,8 @@ See `kom-allow-incompleteness'."
(lyskom-get-string 'superconf-conf-letter) " "))
(cond ((conf-type->secret (conf-stat->conf-type cs)) (lyskom-get-string 'secret-conf-letter))
((conf-type->rd_prot (conf-stat->conf-type cs)) (lyskom-get-string 'protected-conf-letter))
(t " ")))
(t " "))
(conf-stat->garb-nice cs))
(sit-for 0))))
......
......@@ -2637,17 +2637,44 @@ See `kom-keep-alive' for more information."
(or pers-no
(lyskom-read-conf-no (lyskom-get-string 'pers-to-check-mship-for)
'(all) nil nil t)))
(conf-no
(or conf-no
(lyskom-read-conf-no (lyskom-get-string 'conf-to-check-mship-of)
(conf-stat
(if conf-no
(blocking-do 'get-conf-stat conf-no)
(lyskom-read-conf-stat (lyskom-get-string 'conf-to-check-mship-of)
'(all) nil nil t)))
(mship (lyskom-is-member conf-no pers-no)))
(mship (lyskom-is-member (conf-stat->conf-no conf-stat) pers-no)))
(if mship
(if (membership-type->passive (membership->type mship))
(lyskom-format-insert 'pers-is-passive-member-of-conf
pers-no conf-no)
(lyskom-format-insert 'pers-is-member-of-conf pers-no conf-no))
(lyskom-format-insert 'pers-is-not-member-of-conf pers-no conf-no))))
pers-no conf-stat)
(lyskom-format-insert 'pers-is-member-of-conf pers-no conf-stat)
(when kom-deferred-printing
(lyskom-format-insert
'pers-is-member-of-conf-2
(lyskom-format-time
'date-and-time
(membership->last-time-read mship))
(lyskom-create-defer-info
'query-read-texts
(list pers-no (conf-stat->conf-no conf-stat) t 0)
(lambda (membership defer-info)
(if (null membership)
(lyskom-replace-deferred
defer-info (lyskom-get-string 'Unknown-number))
(let ((conf-stat (defer-info->data defer-info)))
(lyskom-replace-deferred defer-info
(number-to-string
(- (+ (conf-stat->first-local-no conf-stat)
(conf-stat->no-of-texts conf-stat))
(membership->last-text-read membership)
(length (membership->read-texts membership))
1))))))
nil nil "%#1s" conf-stat))))
(lyskom-format-insert 'pers-is-not-member-of-conf pers-no (conf-stat->conf-no conf-stat)))))
;;; ================================================================
;;; Help
(def-kom-command kom-help (&optional section)
"Run the built-in help system."
......
......@@ -103,13 +103,21 @@
The insertion will be at (point)."
(set-defer-info->last-viewed defer-info lyskom-last-viewed)
;; (goto-char (defer-info->pos defer-info))
(funcall (intern-soft (concat "initiate-"
(if (and (defer-info->call-par defer-info)
(listp (defer-info->call-par defer-info)))
(apply (intern-soft (concat "initiate-"
(symbol-name (defer-info->server-call
defer-info))))
defer-info))))
'deferred
(defer-info->handler defer-info)
(defer-info->call-par defer-info)
defer-info))
(append (defer-info->call-par defer-info) (list defer-info)))
(funcall (intern-soft (concat "initiate-"
(symbol-name (defer-info->server-call
defer-info))))
'deferred
(defer-info->handler defer-info)
(defer-info->call-par defer-info)
defer-info)))
(defun lyskom-replace-deferred (defer-info &rest replacement-data)
"Replace some defered text."
......
......@@ -600,6 +600,8 @@ Read all about it at http://www.lysator.liu.se/history/")
(pers-is-member-of-conf . "Yes, %#1P is a member of the conference %#2M.\n")
(pers-is-passive-member-of-conf . "Well, %#1P is only a passive member of the conference %#2M.\n")
(pers-is-not-member-of-conf . "No, %#1P is not a member of the conference %#2M.\n")
(pers-is-member-of-conf-2 . "Number of unread: %#2D (last access %#1s)\n")
(Unknown-number . "Unknown number")
; From commands2.el:
......
......@@ -823,6 +823,8 @@ M
(pers-is-member-of-conf . "Ja, %#1P r medlem i mtet %#2M.\n")
(pers-is-passive-member-of-conf . "Nja, %#1P r bara passiv medlem i mtet %#2M.\n")
(pers-is-not-member-of-conf . "Nej, %#1P r inte medlem i mtet %#2M.\n")
(pers-is-member-of-conf-2 . "Antal olsta: %#2D (senast inne %#1s)\n")
(Unknown-number . "Oknt antal")
;; +++ cant seem to find where these are used:
(name-is-not-in-conf . "%#1s r inte nrvarande i ngot mte.\n")
......@@ -4004,7 +4006,7 @@ i servern. Annars sparas det i din .emacs.")
teckensnitt.")
(kom-morons-face-doc . "\
Teckensnitt fr idioter och knppskallar. De personer som rknas upp
i listan \"vnner och bekanta\" kommer att markeras med detta
i listan \"Idioter och knppskallar\" kommer att markeras med detta
teckensnitt.")
(kom-presence-face-doc . "\
Teckensnitt fr nrvaromeddelanden.")
......
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