Commit 7d237023 authored by Peter Liljenberg's avatar Peter Liljenberg
Browse files

Nytt kommando: Vilka (är inloggade) i möte

lyskom-edit-mode definierar comment-start och comment-end.
parent ce524e97
......@@ -54,6 +54,12 @@ tar-arkivet.
** Man kan markera med markering 0 nu.
** Nytt kommando: Vilka (är inloggade) i möte (bundet till lv)
Som vilka, men visar endast medlemmar i ett visst möte.
** Man kan citatmarkera text vid editering av ett inlägg med
comment-region.
* Tilläggsinformation
......
Wed May 6 17:45:57 1998 Peter Liljenberg <petli@lysator.liu.se>
* swedish-strings.el, english-strings.el, commands1.el:
Nytt kommando: Vilka r inloggade i mte.
Thu Mar 12 19:51:06 1998 David Kagedal <davidk@lysator.liu.se>
* menus.el (lyskom-do-popup-menu): Tog bort ett extra nreverse.
......@@ -10,7 +15,13 @@ Mon Feb 23 22:41:38 1998 David K
Sun Feb 22 11:37:57 1998 David Kgedal <davidk@lysator.liu.se>
* startup.el (lyskom): Stt lyskom-server-port.
Wed Feb 18 18:51:28 1998 Peter Liljenberg <petli@lysator.liu.se>
* edit-text.el (lyskom-edit-mode): Stter comment-start och
comment-end s man kan anvnda comment-region fr att citatmarkera
text.
1998-01-31 David Byers <davby@ida.liu.se>
* startup.el (lyskom): Testa att bde namn och portnummer stmmer
......
......@@ -2078,12 +2078,35 @@ If the prefix is 0, all visible sessions are shown."
(lyskom-no-users
(lyskom-insert (lyskom-get-string 'null-who-info)))))
;;; ================================================================
;;; Vilka ({r inloggade i) möte - Who is on in a conference?
;;; Author: petli
(defun lyskom-who-is-on-8 ()
(def-kom-command kom-who-is-on-in-conference (&optional arg)
"Display a list of all connected users in CONF.
The prefix arg controls the idle limit of the sessions showed. If the
prefix is negativ, invisible sessions are also shown.
If the prefix is 0, all visible sessions are shown."
(interactive "P")
(let ((conf-stat
(lyskom-read-conf-stat (lyskom-get-string 'who-is-on-in-what-conference)
'(all) nil nil t)))
(condition-case nil
(if lyskom-dynamic-session-info-flag
(lyskom-who-is-on-9 arg conf-stat)
(lyskom-who-is-on-8 conf-stat))
(lyskom-no-users
(lyskom-insert (lyskom-get-string 'null-who-info))))))
(defun lyskom-who-is-on-8 (&optional conf-stat)
"Display a list of all connected users.
Uses Protocol A version 8 calls"
(let* ((who-info-list (blocking-do 'who-is-on))
(who-list (sort (listify-vector who-info-list)
(who-list (sort (if conf-stat
(lyskom-who-is-on-check-membership-8 who-info-list conf-stat)
(listify-vector who-info-list))
(function (lambda (who1 who2)
(< (who-info->connection who1)
(who-info->connection who2))))))
......@@ -2097,6 +2120,10 @@ Uses Protocol A version 8 calls"
session-width "s" "s"))
(lyskom-default-conf-string 'not-present-anywhere)
(lyskom-default-pers-string 'secret-person))
(if conf-stat
(lyskom-format-insert 'who-is-active-and-member conf-stat))
(lyskom-format-insert format-string-2
""
(lyskom-get-string 'lyskom-name)
......@@ -2136,7 +2163,7 @@ Uses Protocol A version 8 calls"
(lyskom-insert (lyskom-format 'total-visible-users total-users))))
(defun lyskom-who-is-on-9 (arg)
(defun lyskom-who-is-on-9 (arg &optional conf-stat)
"Display a list of all connected users.
Uses Protocol A version 9 calls"
(let* ((wants-invisibles (or (and (numberp arg) (< arg 0))
......@@ -2148,7 +2175,9 @@ Uses Protocol A version 9 calls"
(t 0))))
(who-info-list (blocking-do 'who-is-on-dynamic
't wants-invisibles (* idle-hide 60)))
(who-list (sort (listify-vector who-info-list)
(who-list (sort (if conf-stat
(lyskom-who-is-on-check-membership-9 who-info-list conf-stat)
(listify-vector who-info-list))
(function
(lambda (who1 who2)
(< (dynamic-session-info->session who1)
......@@ -2172,6 +2201,9 @@ Uses Protocol A version 9 calls"
(if wants-invisibles
(lyskom-insert (lyskom-get-string 'showing-invisibles)))
(if conf-stat
(lyskom-format-insert 'who-is-active-and-member conf-stat))
(lyskom-format-insert format-string-2
""
......@@ -2246,6 +2278,34 @@ Uses Protocol A version 9 calls"
'total-visible-active-users))
total-users))))
(defun lyskom-who-is-on-check-membership-8 (who-info-list conf-stat)
"Returns a list of those in WHO-INFO-LIST which is member in CONF-STAT."
(let ((members (blocking-do 'get-members (conf-stat->conf-no conf-stat)
0 (conf-stat->no-of-members conf-stat)))
(len (length who-info-list))
(i 0)
(res nil))
(while (< i len)
(if (lyskom-conf-no-list-member (who-info->pers-no (aref who-info-list i))
members)
(setq res (cons (aref who-info-list i) res)))
(setq i (1+ i)))
res))
(defun lyskom-who-is-on-check-membership-9 (who-info-list conf-stat)
"Returns a list of those in WHO-INFO-LIST which is member in CONF-STAT."
(let ((members (blocking-do 'get-members (conf-stat->conf-no conf-stat)
0 (conf-stat->no-of-members conf-stat)))
(len (length who-info-list))
(i 0)
(res nil))
(while (< i len)
(if (lyskom-conf-no-list-member (dynamic-session-info->person (aref who-info-list i))
members)
(setq res (cons (aref who-info-list i) res)))
(setq i (1+ i)))
res))
(defun lyskom-insert-deferred-session-info (session-info defer-info)
(if session-info
(lyskom-replace-deferred defer-info
......
......@@ -654,7 +654,7 @@ send. If DONTSHOW is non-nil, don't display the sent message."
;;; Rehacked: Inge Wallin
(defvar lyskom-special-conf-name "\\`Inl.gg .t mig\\'"
(defvar lyskom-special-conf-name "\\`\\(Inl.gg .t mig\\|NL:\\)\\'"
"Regexp to match conf names that are special.")
(def-kom-command kom-list-news (&optional num)
......
......@@ -428,6 +428,10 @@ so it's not as clean as it ought to be."
(substitute-command-keys
(lyskom-get-string 'header-separator)))
"$\\|" paragraph-separate))
(make-local-variable 'comment-start)
(make-local-variable 'comment-end)
(setq comment-start kom-cite-string
comment-end "")
(run-hooks 'lyskom-edit-mode-hook)))
(defun lyskom-edit-sending-mode (arg)
......
......@@ -431,6 +431,8 @@ Read all about it at http://www.lysator.liu.se/history/")
(no-unread-lyskom-r . "There is no active LysKOM session with unread texts.\n")
(no-unread-lyskom . "There is no active LysKOM session with unread texts.")
(who-is-on-in-what-conference . "Who in which conference: ")
(who-is-active-and-member . "Only members in %#1M are shown.\n")
; From commands2.el:
......@@ -1204,6 +1206,8 @@ Contents: \"%#9s\"
(kom-review-backward . "(Review) Backwards")
(kom-view-next-text . "(Read) next article")
(kom-who-is-on . "Who is on")
(kom-who-is-on-in-conference
. "Who (is on) in conference")
(kom-who-am-i . "Where (am) i")
; (kom-display-who-buffer . "Display who (list)")
(kom-list-clients . "List clients")
......@@ -1554,6 +1558,7 @@ Contents: \"%#9s\"
(define-key lyskom-en-mode-map "ls" 'kom-membership)
(define-key lyskom-en-mode-map "la" 'kom-list-summary)
(define-key lyskom-en-mode-map "lf" 'kom-list-filters)
(define-key lyskom-en-mode-map "lw" 'kom-who-is-on-in-conference)
(define-key lyskom-en-mode-map "S" 'kom-add-self)
(define-key lyskom-en-mode-map "M" 'kom-mark-text)
(define-key lyskom-en-mode-map "U" 'kom-unmark-text)
......
......@@ -430,6 +430,9 @@ i svensk datorhistoria. L
(no-unread-lyskom-r . "Hittar ingen aktiv LysKOM-session med olsta.\n")
(no-unread-lyskom . "Hittar ingen aktiv LysKOM-session med olsta.")
(who-is-on-in-what-conference . "Vilka i vilket mte: ")
(who-is-active-and-member . "Visar endast medlemmar i %#1M.\n")
;; From commands2.el:
(your-memberships . "Ditt medlemskap i olika KOM-mten:\n")
......@@ -1220,6 +1223,8 @@ Inneh
(kom-review-backward . "(terse) Baklnges")
(kom-view-next-text . "Lsa nsta inlgg")
(kom-who-is-on . "Vilka r inloggade")
(kom-who-is-on-in-conference
. "Vilka (r inloggade) i mte")
(kom-who-am-i . "Var (r) jag")
; (kom-display-who-buffer "Visa vilkalistan")
(kom-list-clients . "Lista klienter")
......@@ -1604,6 +1609,7 @@ Inneh
(define-key lyskom-sv-mode-map "l{" 'kom-list-summary)
(define-key lyskom-sv-mode-map "l[" 'kom-list-summary)
(define-key lyskom-sv-mode-map "lf" 'kom-list-filters)
(define-key lyskom-sv-mode-map "lv" 'kom-who-is-on-in-conference)
(define-key lyskom-sv-mode-map "m" 'kom-add-self)
(define-key lyskom-sv-mode-map "M" 'kom-mark-text)
(define-key lyskom-sv-mode-map "A" 'kom-unmark-text)
......@@ -1947,7 +1953,8 @@ i servern. Annars sparas det i din .emacs.")
(audio-cues . "Ljudsignaler\n")
(audio-cues-when . "Ge ljudsignal:\n")
(automatic-replies . "Automatiskt svar\n")
(mail-import . "Emailimport\n")
(audio-cues-doc . "\
Efterfljande instllningar bestmmer vilken ljudsignal LysKOM skall ge
i olika situationer. Fljande alternativ gr att vlja:
......@@ -2446,6 +2453,17 @@ i servern. Annars sparas det i din .emacs.")
av elispklienten, men det var visst ngon som ville ha det, s ...")
(kom-mail-address-doc . "\
Vrde fr From:-headern i skickade email.")
(kom-mail-importer-persons-doc . "\
Personer som i sjlva verket r emailimportrer. Inlgg av dessa
personer kommer att formatteras som emailtexter istllet fr som
vanliga inlgg.")
(kom-mail-visible-headers-doc . "\
Visa dessa headers i emailtexter.")
;;
;; Tags for variables
;;
......@@ -2554,6 +2572,10 @@ i servern. Annars sparas det i din .emacs.")
(kom-default-language-tag . "Sprk: ")
(kom-show-namedays-tag . "Visa dagens namn:")
(kom-ispell-dictionary-tag . "Ordlista:")
(kom-mail-address-tag . "Emailadress: ")
(kom-mail-importer-persons-tag . "Mailimportrer: ")
(kom-mail-visible-headers-tag . "Visa dessa headers:")
)
)
......
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