Commit 1ff95867 authored by David Byers's avatar David Byers
Browse files

Ny completing-read, småfel i filter.el, ansaphone.el, vars.el

parent ca8d65ca
Mon Jul 8 10:37:48 1996 David Byers <davby@sen2.ida.liu.se>
* filter.el (kom-super-jump): Vljer mottagare att filtrera som
aktuellt mte om inlgget har aktuellt mte som mottagare, annars
inlggets frsta mottagare.
* english-strings.el, swedish-strings.el (lyskom-strings): Lade
till no-recipient.
Thu Jul 4 14:10:36 1996 David Byers <davby@sen2.ida.liu.se>
* completing-read.el: Totalt omskriven. Strre, kanske
lngsammare, men jag vet hur den fungerar nu.
(lyskom-read-conf-no): Ny betydelse av PREDICATE-parametern.
(lyskom-read-conf-stat): Ny parameterlista (nytt PREDICATE,
MUSTMATCH tillagt.)
(lyskom-read-conf-name): Nu parameterlista. Ny ordning, lagt till
EMPTY-parametern.
(lyskom-read-conf-internal): Ny funktion som gr allt jobb.
(lyskom-read-conf-name-internal): Utbytt mot
lyskom-read-conf-internal.
(lyskom-read-conf-get-logins, lyskom-read-conf-expand-specials,
lyskom-read-conf-lookup-specials, lyskom-lookup-conf-by-name,
lyskom-complete-collect, lyskom-read-conf-internal-verify-type,
lyskom-complete-string, lyskom-complete-string-up-level,
lyskom-complete-string-skip-parens-backup-others,
lyskom-complete-string-skip-parens-2,
lyskom-complete-string-next-word,
lyskom-complete-string-reset-position): Nya funktioner.
* startup.el (kom-start-anew): ndrade predicate-parametern till
lyskom-read-conf-nnting. Anvnd lyskom-lookup-conf-by-name.
* review.el (lyskom-review-by-to): ndrade predicate-parametern
till lyskom-read-conf-nnting.
* commands2.el (kom-status-conf, kom-status-person,
kom-send-message, kom-set-garb-nice, kom-set-permitted-submitters,
kom-set-super-conf, kom-change-conf-type): ndrade
predicate-parametern till lyskom-read-conf-nnting.
* edit-text.el (lyskom-edit-add-recipient/copy): ndrade
predicate-parametern till lyskom-read-conf-nnting.
* filter.el (kom-filter-subject, kom-filter-author,
kom-filter-text): ndrade predicate-parametern till
lyskom-read-conf-nnting.
* commands1.el (kom-delete-conf, kom-review-presentation,
kom-send-letter, kom-add-member, kom-add-self, kom-sub-member,
kom-sub-self, kom-change-presentation, kom-change-conf-motd,
kom-unset-conf-motd, kom-go-to-conf, kom-change-name,
kom-change-supervisor, kom-change-password,
lyskom-add-sub-recipient): ndrade predicate-parametern till
lyskom-read-conf-nnting.
* startup.el (kom-start-anew): Anropa lyskom-login-hook oxo. Den
sparas *inte* i servern.
* vars.el.in (lyskom-text-buttons): Ny definition av regexpen fr
textnummer.
Tue Jul 2 09:14:53 1996 David Kgedal <davidk@lysator.liu.se> Tue Jul 2 09:14:53 1996 David Kgedal <davidk@lysator.liu.se>
* lyskom-rest.el (lyskom-prefetch-comment-stats): Ny funktion. * lyskom-rest.el (lyskom-prefetch-comment-stats): Ny funktion.
...@@ -11,6 +74,18 @@ Sun Jun 23 02:16:23 1996 David K ...@@ -11,6 +74,18 @@ Sun Jun 23 02:16:23 1996 David K
* edit-text.el (lyskom-edit-parse-headers): Kr * edit-text.el (lyskom-edit-parse-headers): Kr
lyskom-swascii-header-subject genom regexp-quote innan matchning. lyskom-swascii-header-subject genom regexp-quote innan matchning.
Sat Jun 22 17:15:53 1996 David Byers <davby@sen2.ida.liu.se>
* ansaphone.el (lyskom-ansaphone-message-handler): Spara
meddelanden enbart om kom-ansaphone-record-messages r icke-nil
(request frn Tommy Persson). Visa inte alltid meddelanden som
spelas in.
* vars.el.in (lyskom-elisp-variables): Lade till
kom-ansaphone-record-messages och kom-ansaphone-show-messages.
(kom-ansaphone-record-messages): Ny variabel.
(kom-ansaphone-show-messages): Nu variabel.
Thu Jun 20 01:08:00 1996 David Kgedal <davidk@lysator.liu.se> Thu Jun 20 01:08:00 1996 David Kgedal <davidk@lysator.liu.se>
* async.el (lyskom-show-logged-in-person): Hantera hemliga * async.el (lyskom-show-logged-in-person): Hantera hemliga
......
...@@ -3,7 +3,14 @@ Att g ...@@ -3,7 +3,14 @@ Att g
Buggar Buggar
Completion-koden är ivägen när man vill skapa nya personer. Completion bryr sig inte om MUSTMATCH-parametern.
Om KOMNAME är satt till "" så kommer completionkoden att försöka
komplettera det till alla personer. Det vill man *inte*.
Completion-koden är ivägen när man vill skapa nya personer. [Nåja,
inte så mycket. Det är bara att man inte får skapa namn som är
prefix till existerande namn]
Om man läser ett inlägg som har en fotnot (t ex 1449843) och vill Om man läser ett inlägg som har en fotnot (t ex 1449843) och vill
spara det på fil, så blir det bara fotnoten som sparas. Man vill spara det på fil, så blir det bara fotnoten som sparas. Man vill
...@@ -22,11 +29,12 @@ Buggar ...@@ -22,11 +29,12 @@ Buggar
till nil. (FIXAT) till nil. (FIXAT)
LysKOMs completing-read är skit. Den gör fel. Den borde skrivas om. LysKOMs completing-read är skit. Den gör fel. Den borde skrivas om.
(FIXAT)
lyskom-try-complete-partials borde returnera exakta matchar före lyskom-try-complete-partials borde returnera exakta matchar före
längsta match. Nu blir (lyskom-try-complete-partials "link" längsta match. Nu blir (lyskom-try-complete-partials "link"
'(("(foo) link (bar)" . 1) ("linkfoobar" . 2))) "linkfoobar", inte '(("(foo) link (bar)" . 1) ("linkfoobar" . 2))) "linkfoobar", inte
"(foo) link (bar)". "(foo) link (bar)". (FUNKTIONEN ERSATT; FIXAT)
Om ett namn som fylls i i efterhand gör att raden blir för lång, Om ett namn som fylls i i efterhand gör att raden blir för lång,
så scrollar klienten ibland trots att den inte borde. så scrollar klienten ibland trots att den inte borde.
......
...@@ -125,6 +125,11 @@ See kom-ansaphone-on" ...@@ -125,6 +125,11 @@ See kom-ansaphone-on"
(lyskom-set-current-message-text (substring text (lyskom-set-current-message-text (substring text
(match-beginning 1) (match-beginning 1)
(match-end 1))))) (match-end 1)))))
;;
;; See if we want to reply to this message
;;
(if (and kom-ansaphone-on (if (and kom-ansaphone-on
sender sender
recipient recipient
...@@ -144,11 +149,25 @@ See kom-ansaphone-on" ...@@ -144,11 +149,25 @@ See kom-ansaphone-on"
lyskom-ansaphone-when-set) lyskom-ansaphone-when-set)
(elt reply 4))) (elt reply 4)))
(lyskom-ansaphone-send-message sender reply))))) (lyskom-ansaphone-send-message sender reply)))))
(if (and kom-ansaphone-on sender)
;;
;; See if we want to record this message
;;
(if (and kom-ansaphone-on
kom-ansaphone-record-messages
sender)
(lyskom-ansaphone-record-message sender (lyskom-ansaphone-record-message sender
recipient recipient
lyskom-message-current-text))) lyskom-message-current-text)))
nil)
;;
;; Perhaps we want to show the message, perhaps not
;;
(if kom-ansaphone-on
(not kom-ansaphone-show-messages)
nil))
......
...@@ -70,7 +70,7 @@ ...@@ -70,7 +70,7 @@
(interactive) (interactive)
(let ((conf-stat (let ((conf-stat
(lyskom-read-conf-stat (lyskom-get-string 'what-conf-to-delete) (lyskom-read-conf-stat (lyskom-get-string 'what-conf-to-delete)
'all))) '(all))))
(if conf-stat (if conf-stat
(if (lyskom-ja-or-nej-p (if (lyskom-ja-or-nej-p
(lyskom-format 'confirm-delete-pers-or-conf (lyskom-format 'confirm-delete-pers-or-conf
...@@ -128,7 +128,7 @@ ...@@ -128,7 +128,7 @@
(blocking-do 'get-conf-stat who) (blocking-do 'get-conf-stat who)
(lyskom-read-conf-stat (lyskom-read-conf-stat
(lyskom-get-string 'presentation-for-whom) (lyskom-get-string 'presentation-for-whom)
'all)))) '(all)))))
(if (null conf-stat) (if (null conf-stat)
(lyskom-insert-string 'somebody-deleted-that-conf) (lyskom-insert-string 'somebody-deleted-that-conf)
(lyskom-format-insert 'review-presentation-of (lyskom-format-insert 'review-presentation-of
...@@ -236,7 +236,7 @@ as TYPE. If no such misc-info, return NIL" ...@@ -236,7 +236,7 @@ as TYPE. If no such misc-info, return NIL"
(let* ((tono (or pers-no (let* ((tono (or pers-no
(lyskom-read-conf-no (lyskom-read-conf-no
(lyskom-get-string 'who-letter-to) (lyskom-get-string 'who-letter-to)
'all nil nil t))) '(all) nil nil t)))
(conf-stat (blocking-do 'get-conf-stat tono))) (conf-stat (blocking-do 'get-conf-stat tono)))
(if (if (zerop (conf-stat->msg-of-day conf-stat)) (if (if (zerop (conf-stat->msg-of-day conf-stat))
t t
...@@ -274,9 +274,9 @@ as TYPE. If no such misc-info, return NIL" ...@@ -274,9 +274,9 @@ as TYPE. If no such misc-info, return NIL"
Ask for the name of the person, the conference to add him/her to." Ask for the name of the person, the conference to add him/her to."
(interactive) (interactive)
(let* ((who (lyskom-read-conf-stat (lyskom-get-string 'who-to-add) (let* ((who (lyskom-read-conf-stat (lyskom-get-string 'who-to-add)
'pers)) '(pers)))
(whereto (lyskom-read-conf-stat (lyskom-get-string 'where-to-add) (whereto (lyskom-read-conf-stat (lyskom-get-string 'where-to-add)
'all)) '(all)))
(pers-stat (blocking-do 'get-pers-stat (conf-stat->conf-no who)))) (pers-stat (blocking-do 'get-pers-stat (conf-stat->conf-no who))))
(lyskom-add-member-answer (lyskom-try-add-member whereto who pers-stat) (lyskom-add-member-answer (lyskom-try-add-member whereto who pers-stat)
whereto who))) whereto who)))
...@@ -291,7 +291,7 @@ Ask for the name of the person, the conference to add him/her to." ...@@ -291,7 +291,7 @@ Ask for the name of the person, the conference to add him/her to."
(let ((whereto (if conf (blocking-do 'get-conf-stat conf) (let ((whereto (if conf (blocking-do 'get-conf-stat conf)
(lyskom-read-conf-stat (lyskom-read-conf-stat
(lyskom-get-string 'where-to-add-self) (lyskom-get-string 'where-to-add-self)
'all))) '(all) nil "" t)))
(who (blocking-do 'get-conf-stat lyskom-pers-no)) (who (blocking-do 'get-conf-stat lyskom-pers-no))
(pers-stat (blocking-do 'get-pers-stat lyskom-pers-no))) (pers-stat (blocking-do 'get-pers-stat lyskom-pers-no)))
(lyskom-add-member-answer (lyskom-try-add-member whereto who pers-stat) (lyskom-add-member-answer (lyskom-try-add-member whereto who pers-stat)
...@@ -455,9 +455,10 @@ Also adds to lyskom-to-do-list." ...@@ -455,9 +455,10 @@ Also adds to lyskom-to-do-list."
of the person." of the person."
(interactive) (interactive)
(lyskom-sub-member (lyskom-sub-member
(lyskom-read-conf-stat (lyskom-get-string 'who-to-exclude) 'pers nil "") (lyskom-read-conf-stat (lyskom-get-string 'who-to-exclude)
'(pers) nil "")
(lyskom-read-conf-stat (lyskom-get-string 'where-from-exclude) (lyskom-read-conf-stat (lyskom-get-string 'where-from-exclude)
'all nil ""))) '(all) nil "")))
(def-kom-command kom-sub-self (&optional conf) (def-kom-command kom-sub-self (&optional conf)
...@@ -467,7 +468,7 @@ of the person." ...@@ -467,7 +468,7 @@ of the person."
(blocking-do 'get-conf-stat lyskom-pers-no) (blocking-do 'get-conf-stat lyskom-pers-no)
(if conf (blocking-do 'get-conf-stat conf) (if conf (blocking-do 'get-conf-stat conf)
(lyskom-read-conf-stat (lyskom-get-string 'leave-what-conf) (lyskom-read-conf-stat (lyskom-get-string 'leave-what-conf)
'all nil '(all) nil
(let ((ccn (let ((ccn
(if (or (zerop lyskom-current-conf)) (if (or (zerop lyskom-current-conf))
"" ""
...@@ -913,7 +914,7 @@ Don't ask for confirmation." ...@@ -913,7 +914,7 @@ Don't ask for confirmation."
(lyskom-change-pres-or-motd-2 (lyskom-change-pres-or-motd-2
(let ((no (lyskom-read-conf-no (let ((no (lyskom-read-conf-no
(lyskom-get-string 'what-to-change-pres-you) (lyskom-get-string 'what-to-change-pres-you)
'all t nil t))) '(all) t nil t)))
(if (zerop no) (if (zerop no)
(setq no lyskom-pers-no)) (setq no lyskom-pers-no))
(blocking-do 'get-conf-stat no)) (blocking-do 'get-conf-stat no))
...@@ -925,7 +926,7 @@ Don't ask for confirmation." ...@@ -925,7 +926,7 @@ Don't ask for confirmation."
(interactive) (interactive)
(lyskom-change-pres-or-motd-2 (lyskom-change-pres-or-motd-2
(let ((no (lyskom-read-conf-no (lyskom-get-string 'who-to-put-motd-for) (let ((no (lyskom-read-conf-no (lyskom-get-string 'who-to-put-motd-for)
'all t nil t))) '(all) t nil t)))
(if (zerop no) (if (zerop no)
(setq no lyskom-pers-no)) (setq no lyskom-pers-no))
(blocking-do 'get-conf-stat no)) (blocking-do 'get-conf-stat no))
...@@ -990,7 +991,7 @@ TYPE is either 'pres or 'motd, depending on what should be changed." ...@@ -990,7 +991,7 @@ TYPE is either 'pres or 'motd, depending on what should be changed."
(interactive) (interactive)
(let ((conf-stat (or (lyskom-read-conf-stat (let ((conf-stat (or (lyskom-read-conf-stat
(lyskom-get-string 'who-to-remove-motd-for) (lyskom-get-string 'who-to-remove-motd-for)
'all 'empty) '(all) t)
(blocking-do 'get-conf-stat lyskom-pers-no)))) (blocking-do 'get-conf-stat lyskom-pers-no))))
(cond (cond
((null conf-stat) ((null conf-stat)
...@@ -1019,7 +1020,7 @@ back on lyskom-to-do-list." ...@@ -1019,7 +1020,7 @@ back on lyskom-to-do-list."
(blocking-do 'get-conf-stat conf-no) (blocking-do 'get-conf-stat conf-no)
(lyskom-read-conf-stat (lyskom-read-conf-stat
(lyskom-get-string 'go-to-conf-p) (lyskom-get-string 'go-to-conf-p)
'all "")))) '(all) nil "" t))))
(lyskom-go-to-conf conf))) (lyskom-go-to-conf conf)))
...@@ -1224,7 +1225,7 @@ If you are not member in the conference it will be flagged with an asterisk." ...@@ -1224,7 +1225,7 @@ If you are not member in the conference it will be flagged with an asterisk."
(interactive) (interactive)
(let ((conf-stat (lyskom-read-conf-stat (let ((conf-stat (lyskom-read-conf-stat
(lyskom-get-string 'name-to-be-changed) (lyskom-get-string 'name-to-be-changed)
'all))) '(all))))
(if (null conf-stat) (if (null conf-stat)
(lyskom-insert-string 'no-such-conf-or-pers) (lyskom-insert-string 'no-such-conf-or-pers)
(let (name) (let (name)
...@@ -1254,13 +1255,13 @@ If you are not member in the conference it will be flagged with an asterisk." ...@@ -1254,13 +1255,13 @@ If you are not member in the conference it will be flagged with an asterisk."
(interactive) (interactive)
(let ((supervisee (lyskom-read-conf-stat (let ((supervisee (lyskom-read-conf-stat
(lyskom-get-string 'who-to-change-supervisor-for) (lyskom-get-string 'who-to-change-supervisor-for)
'all))) '(all))))
(if (null supervisee) (if (null supervisee)
(lyskom-insert-string 'no-such-conf-or-pers) (lyskom-insert-string 'no-such-conf-or-pers)
(lyskom-tell-internat 'kom-tell-change-supervisor) (lyskom-tell-internat 'kom-tell-change-supervisor)
(let ((supervisor (lyskom-read-conf-stat (let ((supervisor (lyskom-read-conf-stat
(lyskom-get-string 'new-supervisor) (lyskom-get-string 'new-supervisor)
'all))) '(all))))
(lyskom-format-insert 'change-supervisor-from-to (lyskom-format-insert 'change-supervisor-from-to
supervisee supervisee
supervisor) supervisor)
...@@ -1385,7 +1386,7 @@ If MARK-NO == 0, review all marked texts." ...@@ -1385,7 +1386,7 @@ If MARK-NO == 0, review all marked texts."
"Change the password for a person." "Change the password for a person."
(interactive) (interactive)
(let ((pers-no (lyskom-read-conf-no (lyskom-get-string 'whos-passwd) (let ((pers-no (lyskom-read-conf-no (lyskom-get-string 'whos-passwd)
'pers 'empty "" t)) '(pers) t "" t))
(old-pw (silent-read (lyskom-get-string 'old-passwd))) (old-pw (silent-read (lyskom-get-string 'old-passwd)))
(new-pw1 (silent-read (lyskom-get-string 'new-passwd))) (new-pw1 (silent-read (lyskom-get-string 'new-passwd)))
(new-pw2 (silent-read (lyskom-get-string 'new-passwd-again)))) (new-pw2 (silent-read (lyskom-get-string 'new-passwd-again))))
...@@ -1789,7 +1790,7 @@ the user has used a prefix command argument." ...@@ -1789,7 +1790,7 @@ the user has used a prefix command argument."
((eq action 'add-copy) 'who-to-add-copy-q) ((eq action 'add-copy) 'who-to-add-copy-q)
((eq action 'sub) 'who-to-sub-q) ((eq action 'sub) 'who-to-sub-q)
(t (lyskom-error "internal error")))) (t (lyskom-error "internal error"))))
'all '(all)
nil nil
(if conf (conf-stat->name conf) ""))) (if conf (conf-stat->name conf) "")))
(result nil)) (result nil))
......
...@@ -119,7 +119,7 @@ otherwise: the conference is read with lyskom-completing-read." ...@@ -119,7 +119,7 @@ otherwise: the conference is read with lyskom-completing-read."
(let ((conf-no (let ((conf-no
(or conf-no (or conf-no
(lyskom-read-conf-no (lyskom-get-string 'conf-for-status) (lyskom-read-conf-no (lyskom-get-string 'conf-for-status)
'all nil nil t))) '(all) nil nil t)))
conf-stat) conf-stat)
(cache-del-conf-stat conf-no) (cache-del-conf-stat conf-no)
(setq conf-stat (blocking-do 'get-conf-stat conf-no)) (setq conf-stat (blocking-do 'get-conf-stat conf-no))
...@@ -266,7 +266,7 @@ otherwise: the conference is read with lyskom-completing-read." ...@@ -266,7 +266,7 @@ otherwise: the conference is read with lyskom-completing-read."
(let ((pers-no (let ((pers-no
(or pers-no (or pers-no
(lyskom-read-conf-no (lyskom-get-string 'pers-for-status) (lyskom-read-conf-no (lyskom-get-string 'pers-for-status)
'pers "" nil t))) '(pers) nil "" t)))
conf-stat conf-stat
pers-stat) pers-stat)
(cache-del-conf-stat pers-no) (cache-del-conf-stat pers-no)
...@@ -422,7 +422,7 @@ otherwise: the conference is read with lyskom-completing-read." ...@@ -422,7 +422,7 @@ otherwise: the conference is read with lyskom-completing-read."
(lyskom-read-conf-no (lyskom-read-conf-no
(format (lyskom-get-string 'who-to-send-message-to) (format (lyskom-get-string 'who-to-send-message-to)
(lyskom-get-string 'everybody)) (lyskom-get-string 'everybody))
'all t '(all) t
;; Initial string: ;; Initial string:
(cond (cond
((eq kom-default-message-recipient 'everybody) nil) ((eq kom-default-message-recipient 'everybody) nil)
...@@ -961,7 +961,7 @@ Format is 23:29 if the text is written today. Otherwise 04-01." ...@@ -961,7 +961,7 @@ Format is 23:29 if the text is written today. Otherwise 04-01."
(interactive) (interactive)
(let ((conf-stat (lyskom-read-conf-stat (let ((conf-stat (lyskom-read-conf-stat
(lyskom-get-string 'conf-to-set-garb-nice-q) (lyskom-get-string 'conf-to-set-garb-nice-q)
'all))) '(all))))
(if (not conf-stat) (if (not conf-stat)
(lyskom-insert-string 'somebody-deleted-that-conf) (lyskom-insert-string 'somebody-deleted-that-conf)
(let ((garb-nice (lyskom-read-number (let ((garb-nice (lyskom-read-number
...@@ -987,15 +987,15 @@ Format is 23:29 if the text is written today. Otherwise 04-01." ...@@ -987,15 +987,15 @@ Format is 23:29 if the text is written today. Otherwise 04-01."
(interactive) (interactive)
(let ((conf-stat (lyskom-read-conf-stat (let ((conf-stat (lyskom-read-conf-stat
(lyskom-get-string 'conf-to-set-permitted-submitters-q) (lyskom-get-string 'conf-to-set-permitted-submitters-q)
'all))) '(all))))
(if (not conf-stat) (if (not conf-stat)
(lyskom-insert-string 'somebody-deleted-that-conf) (lyskom-insert-string 'somebody-deleted-that-conf)
(let ((new-conf (lyskom-read-conf-stat (let ((new-conf (lyskom-read-conf-stat
(lyskom-format 'new-permitted-submitters-q (lyskom-format 'new-permitted-submitters-q
(conf-stat->name conf-stat)) (conf-stat->name conf-stat))
'all '(all)
'empty))) t)))
(if (eq new-conf nil) (if (eq new-conf nil)
(lyskom-format-insert 'permitted-submitters-removed-for-conf (lyskom-format-insert 'permitted-submitters-removed-for-conf
conf-stat) conf-stat)
...@@ -1023,13 +1023,13 @@ Format is 23:29 if the text is written today. Otherwise 04-01." ...@@ -1023,13 +1023,13 @@ Format is 23:29 if the text is written today. Otherwise 04-01."
(interactive) (interactive)
(let ((conf-stat (lyskom-read-conf-stat (let ((conf-stat (lyskom-read-conf-stat
(lyskom-get-string 'conf-to-set-super-conf-q) (lyskom-get-string 'conf-to-set-super-conf-q)
'all))) '(all))))
(if (not conf-stat) (if (not conf-stat)
(lyskom-insert-string 'somebody-deleted-that-conf) (lyskom-insert-string 'somebody-deleted-that-conf)
(let ((new-conf (lyskom-read-conf-stat (let ((new-conf (lyskom-read-conf-stat
(lyskom-format 'new-super-conf-q (lyskom-format 'new-super-conf-q
(conf-stat->name conf-stat)) (conf-stat->name conf-stat))
'all))) '(all))))
;; Set the super conference for conf-stat to new-conf. ;; Set the super conference for conf-stat to new-conf.
(lyskom-format-insert 'super-conf-for-is (lyskom-format-insert 'super-conf-for-is
...@@ -1378,7 +1378,7 @@ membership info." ...@@ -1378,7 +1378,7 @@ membership info."
(interactive) (interactive)
(let* ((conf-no (lyskom-read-conf-no (let* ((conf-no (lyskom-read-conf-no
(lyskom-get-string 'what-conf-to-change) (lyskom-get-string 'what-conf-to-change)
'confs nil "" t)) '(conf) nil "" t))
(open (j-or-n-p (lyskom-get-string 'anyone-member))) (open (j-or-n-p (lyskom-get-string 'anyone-member)))
(secret (if (not open) (secret (if (not open)
(j-or-n-p (lyskom-get-string 'secret-conf)))) (j-or-n-p (lyskom-get-string 'secret-conf))))
......
This diff is collapsed.
...@@ -548,7 +548,7 @@ Entry to this mode runs lyskom-edit-mode-hook." ...@@ -548,7 +548,7 @@ Entry to this mode runs lyskom-edit-mode-hook."
(let ((marker (point-min-marker)) (let ((marker (point-min-marker))
(edit-buffer (current-buffer)) (edit-buffer (current-buffer))
(insert-at (point-min-marker)) (insert-at (point-min-marker))
(conf-stat (lyskom-read-conf-stat prompt 'all nil ""))) (conf-stat (lyskom-read-conf-stat prompt '(all) nil "")))
(lyskom-save-excursion (lyskom-save-excursion
;;(save-excursion ;;(save-excursion
(set-buffer (process-buffer lyskom-proc)) (set-buffer (process-buffer lyskom-proc))
......
...@@ -808,6 +808,7 @@ Error message: %#1s**************************************************") ...@@ -808,6 +808,7 @@ Error message: %#1s**************************************************")
(starting-program . "Starting %#1s...") (starting-program . "Starting %#1s...")
(super-jump . "Filtering subject \"%#1r\" in conference \"%#2M\"\n") (super-jump . "Filtering subject \"%#1r\" in conference \"%#2M\"\n")
(no-recipient . "There are no recipients for this article.\n")
(filtered . "[Filtered]") (filtered . "[Filtered]")
(filter-error-specification . "Error in the filter specification") (filter-error-specification . "Error in the filter specification")
(filter-error-bad-not . "Error in the filter specification after 'not'") (filter-error-bad-not . "Error in the filter specification after 'not'")
......
...@@ -458,7 +458,7 @@ Otherwise return nil." ...@@ -458,7 +458,7 @@ Otherwise return nil."
(setq filter (cons (cons 'subject subject) filter)) (setq filter (cons (cons 'subject subject) filter))
(setq conf (lyskom-read-conf-no (setq conf (lyskom-read-conf-no
(lyskom-get-string 'filter-in-conf) (lyskom-get-string 'filter-in-conf)
'all '(all)
t t
(or (and (conf-stat->conf-no conf-stat) (or (and (conf-stat->conf-no conf-stat)
(conf-stat->name conf-stat)) (conf-stat->name conf-stat))
...@@ -494,7 +494,7 @@ Otherwise return nil." ...@@ -494,7 +494,7 @@ Otherwise return nil."
(text-stat->author text-stat)))) (text-stat->author text-stat))))
(setq author (setq author
(lyskom-read-conf-no (lyskom-get-string 'filter-author) (lyskom-read-conf-no (lyskom-get-string 'filter-author)
'pers '(pers)
t t
(or (and auth-stat (or (and auth-stat
(conf-stat->name auth-stat)) (conf-stat->name auth-stat))
...@@ -504,7 +504,7 @@ Otherwise return nil." ...@@ -504,7 +504,7 @@ Otherwise return nil."
(setq filter (cons (cons 'author-no author) filter))) (setq filter (cons (cons 'author-no author) filter)))
(setq conf (lyskom-read-conf-no (setq conf (lyskom-read-conf-no
(lyskom-get-string 'filter-in-conf) (lyskom-get-string 'filter-in-conf)
'all '(all)
t t
(or (or
(and conf-stat (and conf-stat
...@@ -532,25 +532,45 @@ Otherwise return nil." ...@@ -532,25 +532,45 @@ Otherwise return nil."
"Skip all texts and comments that share the subject and recipient of "Skip all texts and comments that share the subject and recipient of
the current text" the current text"
(interactive) (interactive)
(if (zerop lyskom-current-conf) (if (or (null lyskom-current-text)
(progn (lyskom-insert-string 'no-in-conf) (zerop lyskom-current-text))
(lyskom-end-of-command)) (lyskom-insert-string 'have-to-read)
(if (or (null lyskom-current-text) (let ((text-stat (blocking-do 'get-text-stat lyskom-current-text))
(null lyskom-current-subject)) (recipients nil)
(progn (lyskom-insert-string 'have-to-read) (cc-recipients nil)
(lyskom-end-of-command)) (filter-recipient nil)
(let ((conf-stat (blocking-do 'get-conf-stat lyskom-current-conf))) (conf-stat (if (and lyskom-current-conf
(if conf-stat (not (zerop lyskom-current-conf)))
(progn (blocking-do 'get-conf-stat lyskom-current-conf))))
(lyskom-add-filter (lyskom-traverse misc
(make-filter (text-stat->misc-info-list text-stat)
(list (cons 'subject lyskom-current-subject) (cond ((eq (misc-info->type misc) 'RECPT)
(cons 'recipient-no (conf-stat->conf-no conf-stat))) (setq recipients (cons (misc-info->recipient-no misc)
(list (cons 'action 'skip-tree) recipients)))
(cons 'expire t)))) ((eq (misc-info->type misc) 'CC-RECPT)
(lyskom-format-insert 'super-jump (setq cc-recipients (cons (misc-info->recipient-no misc)