Commit b961e415 authored by Ulrik Haugen's avatar Ulrik Haugen

Replaced (or (eq foo 'a) (eq foo 'b) ...) and similar constructs

with (member foo '(a b ...)) and similar constructs.
parent d65cbf0f
2000-12-31 Ulrik Haugen <qha@lysator.liu.se> 2000-12-31 Ulrik Haugen <qha@lysator.liu.se>
* view-text.el (lyskom-view-text): Replaced
(or (eq foo 'a) (eq foo 'b) ...) with (member foo '(a b ...))
This means that the comparison will be done by `equal' instead,
but that shouldn't matter.
(lyskom-text-read-p): Ditto.
(lyskom-text-read-at-least-once-p): Ditto.
(lyskom-mark-as-read): Ditto.
* utilities.el (lyskom-text-recipients): Ditto.
* review.el (lyskom-get-texts-by-to): Ditto.
(kom-review-backward): Ditto.
(kom-review-clear): Ditto.
* prefetch.el (lyskom-prefetch-text-all-handler): Ditto.
(lyskom-prefetch-texttree-handler): Ditto.
(lyskom-prefetch-texts-handler): Ditto.
* parse.el (lyskom-parse-bitstring): Ditto.
* mship-edit.el (lp--format-insert-entry): Ditto except I replaced
(and (not (eq foo a)) (not (eq foo b)) ...) with
(not (member foo (list a b))
* lyskom-rest.el (kom-view-next-new-text): Ditto.
(kom-view-next-text): Ditto.
(lyskom-is-read-handler): Ditto.
(lyskom-get-prioritized-session): Ditto.
(lyskom-what-to-do): Ditto.
* lyskom-buttons.el (lyskom-generate-button): Ditto.
(lyskom-view-url-windows): Ditto.
(lyskom-view-url-netscape): Ditto.
* komtypes.el (lyskom-is-recipient): Ditto.
* filter.el (lyskom-filter-text-p-2): Ditto.
* filter-edit.el (lyskom-verify-filter-pattern): Ditto.
(lyskom-format-filter-pattern-insert): Ditto.
(lyskom-filter-edit-insert-pattern): Ditto.
* edit-text.el (lyskom-edit-send-check-recipients): Ditto.
(lyskom-edit-send-check-recipients): Ditto.
(lyskom-edit-get-commented): Ditto.
* completing-read.el (lyskom-complete-string): Ditto.
* commands2.el (kom-list-summary): Ditto.
(kom-postpone): Ditto.
(kom-set-personal-label): Ditto.
* commands1.el (lyskom-get-recipients-from-misc-list): Ditto.
(lyskom-list-created-conferences-2): Ditto except I replaced
(or (eq (a) foo) (eq (b) foo) ...) with
(member foo (list (a) (b) ...))
(lyskom-jump): Ditto.
* clienttypes.el (read-list-delete-text): Ditto.
* buffers.el (lyskom-display-buffer): Ditto.
* autoconf.el (extract-configuration-option): Ditto.
* async.el (lyskom-async-new-text): Ditto.
(lyskom-async-deleted-text): Ditto.
* swedish-strings.el (lyskom-sv-mode-map): Made "<delete>" scroll * swedish-strings.el (lyskom-sv-mode-map): Made "<delete>" scroll
up as well as the other delete-keys. up as well as the other delete-keys.
......
...@@ -667,9 +667,7 @@ converted, before insertion." ...@@ -667,9 +667,7 @@ converted, before insertion."
misc-info (text-stat->misc-info-list text-stat) misc-info (text-stat->misc-info-list text-stat)
(let ((type (misc-info->type misc-info))) (let ((type (misc-info->type misc-info)))
(cond (cond
((or (eq type 'RECPT) ((member type '(RECPT CC-RECPT BCC-RECPT))
(eq type 'CC-RECPT)
(eq type 'BCC-RECPT))
;; add on lyskom-reading-list and lyskom-to-do-list if ;; add on lyskom-reading-list and lyskom-to-do-list if
;; this recipient is a recipient that has been checked. ;; this recipient is a recipient that has been checked.
(if (and (eq (misc-info->recipient-no misc-info) (if (and (eq (misc-info->recipient-no misc-info)
...@@ -705,9 +703,7 @@ converted, before insertion." ...@@ -705,9 +703,7 @@ converted, before insertion."
(lyskom-traverse (lyskom-traverse
misc-info (text-stat->misc-info-list text-stat) misc-info (text-stat->misc-info-list text-stat)
(let ((type (misc-info->type misc-info))) (let ((type (misc-info->type misc-info)))
(cond ((or (eq type 'RECPT) (cond ((member type '(RECPT CC-RECPT BCC-RECPT))
(eq type 'CC-RECPT)
(eq type 'BCC-RECPT))
(initiate-get-conf-stat 'async 'lyskom-delete-old-text (initiate-get-conf-stat 'async 'lyskom-delete-old-text
(misc-info->recipient-no misc-info) (misc-info->recipient-no misc-info)
text-stat text-stat
......
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
(cond ((and (eq c ?') (not dquot)) (setq squot (not squot))) (cond ((and (eq c ?') (not dquot)) (setq squot (not squot)))
((and (eq c ?\") (not squot)) (setq dquot (not dquot))) ((and (eq c ?\") (not squot)) (setq dquot (not dquot)))
((eq c ?\\) (setq start (1+ start))) ((eq c ?\\) (setq start (1+ start)))
((and (or (eq c ?\ ) (eq c ?\t) (eq c ?\r) (eq c ?\n)) ((and (member c '(?\ ?\t ?\r ?\n))
(not squot) (not squot)
(not dquot)) (not dquot))
(setq end i)) (setq end i))
......
...@@ -499,7 +499,7 @@ Returns the window displaying BUFFER." ...@@ -499,7 +499,7 @@ Returns the window displaying BUFFER."
;; OTHER, OTHER-WINDOW -- Switch to in another window ;; OTHER, OTHER-WINDOW -- Switch to in another window
;; ;;
((or (eq open 'other) (eq open 'other-window)) ((member open '(other other-window))
(switch-to-buffer-other-window buffer) (switch-to-buffer-other-window buffer)
(setq dedicated-window (selected-window)) (setq dedicated-window (selected-window))
(setq window (selected-window))) (setq window (selected-window)))
......
...@@ -253,9 +253,8 @@ TEXT-NO may be nil, in which case only empty read-infos on RLIST are removed." ...@@ -253,9 +253,8 @@ TEXT-NO may be nil, in which case only empty read-infos on RLIST are removed."
(if text-no (if text-no
(cond (cond
((let ((type (read-info->type (car curr)))) ((let ((type (read-info->type (car curr))))
(or (eq type 'REVIEW) ; Don't change REVIEW et c. ; Don't change REVIEW et c.
(eq type 'REVIEW-TREE) (member type '(REVIEW REVIEW-TREE REVIEW-MARK))))
(eq type 'REVIEW-MARK))))
(t ; Do change all other entries. (t ; Do change all other entries.
(let ((tl (read-info->text-list (car curr)))) (let ((tl (read-info->text-list (car curr))))
(text-list->delq tl text-no))))) (text-list->delq tl text-no)))))
......
...@@ -1209,9 +1209,7 @@ Don't ask for confirmation." ...@@ -1209,9 +1209,7 @@ Don't ask for confirmation."
(let* ((info (car misc-list)) (let* ((info (car misc-list))
(type (misc-info->type info))) (type (misc-info->type info)))
(cond ((null misc-list) '()) (cond ((null misc-list) '())
((or (eq type 'RECPT) ((member type '(RECPT CC-RECPT BCC-RECPT))
(eq type 'CC-RECPT)
(eq type 'BCC-RECPT))
(append (list (intern (downcase (symbol-name type))) (append (list (intern (downcase (symbol-name type)))
(misc-info->recipient-no info)) (misc-info->recipient-no info))
(lyskom-get-recipients-from-misc-list (lyskom-get-recipients-from-misc-list
...@@ -1601,9 +1599,9 @@ Those that you are not a member in will be marked with an asterisk." ...@@ -1601,9 +1599,9 @@ Those that you are not a member in will be marked with an asterisk."
(lyskom-message (lyskom-format (if arg 'finding-created-pers-confs 'finding-created-confs) (lyskom-message (lyskom-format (if arg 'finding-created-pers-confs 'finding-created-confs)
(elt counter 1) (elt counter 1)
(elt counter 2))) (elt counter 2)))
(when (and cs (or (eq (conf-stat->creator cs) pers-no) (when (and cs (member pers-no (list (conf-stat->creator cs)
(eq (conf-stat->supervisor cs) pers-no) (conf-stat->supervisor cs)
(eq (conf-stat->super-conf cs) pers-no))) (conf-stat->super-conf cs))))
(aset counter 3 (1+ (elt counter 3))) (aset counter 3 (1+ (elt counter 3)))
(lyskom-format-insert "%[%#1@%4#2:m %#3c %4#4s %#5s %#2M%]\n" (lyskom-format-insert "%[%#1@%4#2:m %#3c %4#4s %#5s %#2M%]\n"
(lyskom-default-button 'conf (conf-stat->conf-no cs)) (lyskom-default-button 'conf (conf-stat->conf-no cs))
...@@ -3175,8 +3173,7 @@ footnotes) to it as read in the server." ...@@ -3175,8 +3173,7 @@ footnotes) to it as read in the server."
misc misc
(text-stat->misc-info-list text-stat) (text-stat->misc-info-list text-stat)
(cond (cond
((and (or (eq (misc-info->type misc) 'COMM-IN) ((and (member (misc-info->type misc) '(COMM-IN FOOTN-IN))
(eq (misc-info->type misc) 'FOOTN-IN))
(> (if (eq (misc-info->type misc) (> (if (eq (misc-info->type misc)
'COMM-IN) 'COMM-IN)
(misc-info->comm-in misc) (misc-info->comm-in misc)
......
...@@ -937,9 +937,7 @@ on one line." ...@@ -937,9 +937,7 @@ on one line."
(let ((type (read-info->type (let ((type (read-info->type
(read-list->nth lyskom-reading-list (read-list->nth lyskom-reading-list
r)))) r))))
(if (or (eq type 'CONF) (if (member type '(CONF REVIEW-MARK REVIEW))
(eq type 'REVIEW-MARK)
(eq type 'REVIEW))
(setq len 0) (setq len 0)
(++ r)))) (++ r))))
(read-list->nth lyskom-reading-list r))))))) (read-list->nth lyskom-reading-list r)))))))
...@@ -1519,12 +1517,9 @@ current conference to another session." ...@@ -1519,12 +1517,9 @@ current conference to another session."
(> len 0)) (> len 0))
(let ((type (read-info->type (read-list->first lyskom-reading-list)))) (let ((type (read-info->type (read-list->first lyskom-reading-list))))
(cond (cond
((or (eq type 'REVIEW) ((member type '(REVIEW REVIEW-TREE REVIEW-MARK))
(eq type 'REVIEW-TREE)
(eq type 'REVIEW-MARK))
(read-list-rotate lyskom-reading-list)) (read-list-rotate lyskom-reading-list))
((or (eq type 'COMM-IN) ((member type '(COMM-IN FOOTN-IN))
(eq type 'FOOTN-IN))
(set-read-list-del-first lyskom-reading-list)) (set-read-list-del-first lyskom-reading-list))
((eq type 'CONF) ((eq type 'CONF)
(let* ((rlist (read-info->text-list (let* ((rlist (read-info->text-list
...@@ -2025,8 +2020,7 @@ Return-value: 'no-session if there is no suitable session to switch to ...@@ -2025,8 +2020,7 @@ Return-value: 'no-session if there is no suitable session to switch to
0 label))) 0 label)))
(cache-del-text-stat objno)) (cache-del-text-stat objno))
((or (eq type 'conf) ((member type '(conf pers))
(eq type 'pers))
(setq object (setq object
(lyskom-read-conf-stat (lyskom-get-string (lyskom-read-conf-stat (lyskom-get-string
(if (eq type 'pers) (if (eq type 'pers)
......
...@@ -631,8 +631,8 @@ the LysKOM rules of string matching." ...@@ -631,8 +631,8 @@ the LysKOM rules of string matching."
((eq (aref next-char-state 0) 'match) ((eq (aref next-char-state 0) 'match)
(if (eq (aref next-char-state 1) ?\ ) (if (eq (aref next-char-state 1) ?\ )
(progn (progn
(cond ((or (eq (symbol-value current-state) 'start-of-word) (cond ((member (symbol-value current-state)
(eq (symbol-value current-state) 'start-of-string)) '(start-of-word start-of-string))
nil) nil)
((eq last-event-worth-noting 'mismatch) ((eq last-event-worth-noting 'mismatch)
(lyskom-complete-string-accumulate current-accumulator (lyskom-complete-string-accumulate current-accumulator
...@@ -698,9 +698,8 @@ the LysKOM rules of string matching." ...@@ -698,9 +698,8 @@ the LysKOM rules of string matching."
;; ;;
((and (> paren-depth 0) ((and (> paren-depth 0)
(or (eq (aref next-char-state 0) 'mismatch) (member (aref next-char-state 0)
(eq (aref next-char-state 0) 'space-mismatch) '(mismatch space-mismatch open-paren-mismatch)))
(eq (aref next-char-state 0) 'open-paren-mismatch)))
(setq last-event-worth-noting 'mismatch) (setq last-event-worth-noting 'mismatch)
(setq tmp-accumulator nil) (setq tmp-accumulator nil)
(setq tmp-state nil) (setq tmp-state nil)
...@@ -715,8 +714,8 @@ the LysKOM rules of string matching." ...@@ -715,8 +714,8 @@ the LysKOM rules of string matching."
;; ;;
((and (eq (aref next-char-state 0) 'space-mismatch) ((and (eq (aref next-char-state 0) 'space-mismatch)
(or (eq (symbol-value current-state) 'start-of-string) (member (symbol-value current-state)
(eq (symbol-value current-state) 'start-of-word))) '(start-of-string start-of-word)))
(setq last-event-worth-noting nil) (setq last-event-worth-noting nil)
(lyskom-complete-string-skip-whitespace data-list)) (lyskom-complete-string-skip-whitespace data-list))
...@@ -725,12 +724,11 @@ the LysKOM rules of string matching." ...@@ -725,12 +724,11 @@ the LysKOM rules of string matching."
;; Advance to the end of the current word ;; Advance to the end of the current word
;; ;;
((and (or (eq (aref next-char-state 0) 'mismatch) ((and (member (aref next-char-state 0) '(mismatch space-mismatch))
(eq (aref next-char-state 0) 'space-mismatch))
(zerop paren-depth)) (zerop paren-depth))
(setq last-event-worth-noting 'mismatch) (setq last-event-worth-noting 'mismatch)
(if (or (eq (symbol-value current-state) 'start-of-word) (if (member (symbol-value current-state)
(eq (symbol-value current-state) 'start-of-string)) '(start-of-word start-of-string))
(setq done t) (setq done t)
(progn (progn
(if (not have-here) (if (not have-here)
......
...@@ -796,9 +796,7 @@ Cannot be called from a callback." ...@@ -796,9 +796,7 @@ Cannot be called from a callback."
(cond ((eq (car misc) 'comm-to) (cond ((eq (car misc) 'comm-to)
(setq comm-to-list (cons (cdr misc) (setq comm-to-list (cons (cdr misc)
comm-to-list))) comm-to-list)))
((or (eq (car misc) 'recpt) ((member (car misc) '(recpt cc-recpt bcc-recpt))
(eq (car misc) 'cc-recpt)
(eq (car misc) 'bcc-recpt))
(when (eq (car misc) 'recpt) (when (eq (car misc) 'recpt)
(setq num-real-recpt (1+ num-real-recpt)) (setq num-real-recpt (1+ num-real-recpt))
(when (eq (cdr misc) me) (setq num-me (1+ num-me)))) (when (eq (cdr misc) me) (setq num-me (1+ num-me))))
...@@ -915,9 +913,7 @@ Cannot be called from a callback." ...@@ -915,9 +913,7 @@ Cannot be called from a callback."
;; ;;
(lyskom-traverse misc (cdr misc-list) (lyskom-traverse misc (cdr misc-list)
(cond ((or (eq (car misc) 'recpt) (cond ((member (car misc) '(recpt bcc-recpt cc-recpt))
(eq (car misc) 'bcc-recpt)
(eq (car misc) 'cc-recpt))
(if (or (memq (cdr misc) author-list) (if (or (memq (cdr misc) author-list)
(eq (cdr misc) me)) (eq (cdr misc) me))
(setq author-list (delq (cdr misc) author-list)))))) (setq author-list (delq (cdr misc) author-list))))))
...@@ -1082,8 +1078,7 @@ WINDOW plus any optional arguments given in ARG-LIST." ...@@ -1082,8 +1078,7 @@ WINDOW plus any optional arguments given in ARG-LIST."
(lyskom-edit-error nil))) ; Ignore these errors (lyskom-edit-error nil))) ; Ignore these errors
(no nil)) (no nil))
(while headers (while headers
(if (or (eq (car headers) 'comm-to) (if (member (car headers) '(comm-to footn-to))
(eq (car headers) 'footn-to))
(setq no (car (cdr headers)) (setq no (car (cdr headers))
headers nil) headers nil)
(setq headers (cdr (cdr headers))))) (setq headers (cdr (cdr headers)))))
......
...@@ -130,23 +130,17 @@ ...@@ -130,23 +130,17 @@
((eq 'not (car (car filter))) ((eq 'not (car (car filter)))
(lyskom-verify-filter-pattern (lyskom-verify-filter-pattern
(cons (cdr (car filter)) (cdr filter)))) (cons (cdr (car filter)) (cdr filter))))
((or (eq 'author-re (car (car filter))) ((member (car (car filter))
(eq 'recipient-re (car (car filter))) '(author-re recipient-re subject-re text-re))
(eq 'subject-re (car (car filter)))
(eq 'text-re (car (car filter))))
(and (and
(lyskom-filter-verify-regexp (cdr (car filter))) (lyskom-filter-verify-regexp (cdr (car filter)))
(lyskom-verify-filter-pattern (cdr filter)))) (lyskom-verify-filter-pattern (cdr filter))))
((or (eq 'author (car (car filter))) ((member (car (car filter)) '(author subject recipient text))
(eq 'subject (car (car filter)))
(eq 'recipient (car (car filter)))
(eq 'text (car (car filter))))
(and (and
(stringp (cdr (car filter))) (stringp (cdr (car filter)))
(lyskom-verify-filter-pattern (cdr filter)))) (lyskom-verify-filter-pattern (cdr filter))))
((or (eq 'author-no (car (car filter))) ((member (car (car filter)) '(author-no recipient-no))
(eq 'recipient-no (car (car filter))))
(and (and
(integerp (cdr (car filter))) (integerp (cdr (car filter)))
(lyskom-verify-filter-pattern (cdr filter)))) (lyskom-verify-filter-pattern (cdr filter))))
...@@ -281,8 +275,7 @@ If NEG is non-nil, format the negation." ...@@ -281,8 +275,7 @@ If NEG is non-nil, format the negation."
" != " " != "
" = ") " = ")
(cdr (car pat)))) (cdr (car pat))))
(cond ((or (eq (car (car pat)) 'recipient-no) (cond ((member (car (car pat)) '(recipient-no author-no))
(eq (car (car pat)) 'author-no))
(save-excursion (save-excursion
(if (boundp 'lyskom-buffer) (if (boundp 'lyskom-buffer)
(set-buffer lyskom-buffer)) (set-buffer lyskom-buffer))
...@@ -534,17 +527,11 @@ If NEWLINE is non-nil, insert a newline after the header." ...@@ -534,17 +527,11 @@ If NEWLINE is non-nil, insert a newline after the header."
(setq what (cdr (assoc what rev-what))) (setq what (cdr (assoc what rev-what)))
(if (not (if (not
(cond ((or (eq what 'author) (cond ((member what '(author subject text recipient))
(eq what 'subject) (setq arg argstring))
(eq what 'text) ((member what '(author-no recipient-no))
(eq what 'recipient)) (setq arg argstring)) (setq arg (string-to-int argstring)))
((or (eq what 'author-no) ((member what '(author-re subject-re text-re recipient-re))
(eq what 'recipient-no)) (setq arg
(string-to-int argstring)))
((or (eq what 'author-re)
(eq what 'subject-re)
(eq what 'text-re)
(eq what 'recipient-re))
(setq arg argstring) (setq arg argstring)
(lyskom-filter-verify-regexp arg)))) (lyskom-filter-verify-regexp arg))))
(lyskom-error (lyskom-get-string 'filter-edit-bad-argument) (lyskom-error (lyskom-get-string 'filter-edit-bad-argument)
......
...@@ -166,9 +166,7 @@ invalid-value until a filter action has been selected.") ...@@ -166,9 +166,7 @@ invalid-value until a filter action has been selected.")
misc misc
(text-stat->misc-info-list text-stat) (text-stat->misc-info-list text-stat)
(let ((type (misc-info->type misc))) (let ((type (misc-info->type misc)))
(if (or (eq type 'RECPT) (if (member type '(RECPT CC-RECPT BCC-RECPT))
(eq type 'CC-RECPT)
(eq type 'BCC-RECPT))
(initiate-get-conf-stat 'filter (initiate-get-conf-stat 'filter
nil nil
(misc-info->recipient-no misc))))) (misc-info->recipient-no misc)))))
......
...@@ -2024,9 +2024,7 @@ Args: CONF-STAT TAG PERSON" ...@@ -2024,9 +2024,7 @@ Args: CONF-STAT TAG PERSON"
(let ((result nil)) (let ((result nil))
(lyskom-traverse misc (lyskom-traverse misc
(text-stat->misc-info-list text-stat) (text-stat->misc-info-list text-stat)
(when (and (or (eq (misc-info->type misc) 'RECPT) (when (and (member (misc-info->type misc) '(RECPT CC-RECPT BCC-RECPT))
(eq (misc-info->type misc) 'CC-RECPT)
(eq (misc-info->type misc) 'BCC-RECPT))
(eq (misc-info->recipient-no misc) conf-no)) (eq (misc-info->recipient-no misc) conf-no))
(setq result t))) (setq result t)))
result)) result))
......
...@@ -421,8 +421,7 @@ information." ...@@ -421,8 +421,7 @@ information."
(hints (and data (elt data 4))) (hints (and data (elt data 4)))
(the-hint (lyskom-get-button-hint hints)) (the-hint (lyskom-get-button-hint hints))
(props (props
(cond ((and (or (eq type 'conf) (cond ((and (member type '(conf pers))
(eq type 'pers))
numarg) numarg)
(list 'face (list 'face
(or face (or face
...@@ -869,9 +868,7 @@ This is a LysKOM button action." ...@@ -869,9 +868,7 @@ This is a LysKOM button action."
(defun lyskom-view-url-windows (url manager) (defun lyskom-view-url-windows (url manager)
"View the URL URL in Microsoft Windows. MANGER is the URL manager. "View the URL URL in Microsoft Windows. MANGER is the URL manager.
Fall back on Netscape if not running in Microsoft Windows." Fall back on Netscape if not running in Microsoft Windows."
(cond ((or (eq window-system 'win32) (cond ((member window-system '(win32 mswindows w32))
(eq window-system 'mswindows)
(eq window-system 'w32))
(let ((programs '("start" (let ((programs '("start"
"explorer" "explorer"
"C:\\Program Files\\Netscape\\Communicator\\Program\\netscape.exe" "C:\\Program Files\\Netscape\\Communicator\\Program\\netscape.exe"
...@@ -899,9 +896,7 @@ that, starts a new one." ...@@ -899,9 +896,7 @@ that, starts a new one."
(setq url (replace-in-string url "," "%2C")) (setq url (replace-in-string url "," "%2C"))
(setq url (replace-in-string url "(" "%28")) (setq url (replace-in-string url "(" "%28"))
(setq url (replace-in-string url ")" "%29")) (setq url (replace-in-string url ")" "%29"))
(let* ((url-string (if (or (eq window-system 'win32) (let* ((url-string (if (member window-system '(win32 mswindows w32))
(eq window-system 'mswindows)
(eq window-system 'w32))
(list url) (list url)
(list "-remote" (list "-remote"
(format "openUrl(%s)" url)))) (format "openUrl(%s)" url))))
......
...@@ -364,12 +364,9 @@ If the optional argument REFETCH is non-nil, all caches are cleared and ...@@ -364,12 +364,9 @@ If the optional argument REFETCH is non-nil, all caches are cleared and
(> len 1)) (> len 1))
(let ((type (read-info->type (read-list->first lyskom-reading-list)))) (let ((type (read-info->type (read-list->first lyskom-reading-list))))
(cond (cond
((or (eq type 'REVIEW) ((member type '(REVIEW REVIEW-TREE REVIEW-MARK))
(eq type 'REVIEW-TREE)
(eq type 'REVIEW-MARK))
(read-list-rotate lyskom-reading-list)) (read-list-rotate lyskom-reading-list))
((or (eq type 'COMM-IN) ((member type '(COMM-IN FOOTN-IN))
(eq type 'FOOTN-IN))
(set-read-list-del-first lyskom-reading-list)) (set-read-list-del-first lyskom-reading-list))
(t (t
(setq finished t)))) (setq finished t))))
...@@ -399,8 +396,7 @@ If the optional argument REFETCH is non-nil, all caches are cleared and ...@@ -399,8 +396,7 @@ If the optional argument REFETCH is non-nil, all caches are cleared and
(priority (read-info->priority (priority (read-info->priority
(read-list->first lyskom-reading-list))) (read-list->first lyskom-reading-list)))
(is-review-tree (eq type 'REVIEW-TREE)) (is-review-tree (eq type 'REVIEW-TREE))
(is-review (or (eq type 'REVIEW) (is-review (or (member type '(REVIEW REVIEW-MARK))
(eq type 'REVIEW-MARK)
is-review-tree)) is-review-tree))
(mark-as-read (not is-review))) (mark-as-read (not is-review)))
(when is-review (when is-review
...@@ -415,8 +411,7 @@ If the optional argument REFETCH is non-nil, all caches are cleared and ...@@ -415,8 +411,7 @@ If the optional argument REFETCH is non-nil, all caches are cleared and
priority priority
is-review-tree is-review-tree
(not is-review) (not is-review)
(or (eq type 'REVIEW) (member type '(REVIEW REVIEW-MARK))))
(eq type 'REVIEW-MARK))))
(if mark-as-read (if mark-as-read
(lyskom-is-read text-no) (lyskom-is-read text-no)
(read-list-delete-text nil lyskom-reading-list) (read-list-delete-text nil lyskom-reading-list)
...@@ -463,9 +458,7 @@ lyskom-mark-as-read." ...@@ -463,9 +458,7 @@ lyskom-mark-as-read."
"Update lyskom-membership for all recipients to TEXT-STAT." "Update lyskom-membership for all recipients to TEXT-STAT."
(lyskom-traverse (lyskom-traverse
misc (text-stat->misc-info-list text-stat) misc (text-stat->misc-info-list text-stat)
(if (or (eq 'RECPT (misc-info->type misc)) (if (member (misc-info->type misc) '(RECPT BCC-RECPT CC-RECPT))
(eq 'BCC-RECPT (misc-info->type misc))
(eq 'CC-RECPT (misc-info->type misc)))
(let ((membership (lyskom-try-get-membership (let ((membership (lyskom-try-get-membership
(misc-info->recipient-no misc)))) (misc-info->recipient-no misc))))
(if membership (if membership
...@@ -2637,9 +2630,9 @@ Set lyskom-current-prompt accordingly. Tell server what I am doing." ...@@ -2637,9 +2630,9 @@ Set lyskom-current-prompt accordingly. Tell server what I am doing."
(defun lyskom-get-prioritized-session () (defun lyskom-get-prioritized-session ()
"Get the session to go to if we are doing an auto-goto-session" "Get the session to go to if we are doing an auto-goto-session"
(let ((session-list (if (or (eq kom-server-priority-breaks 'express-letters) (let ((session-list (if (member kom-server-priority-breaks
(eq kom-server-priority-breaks 'letters) '(express-letters letters
(eq kom-server-priority-breaks 'after-conf-letters)) after-conf-letters))
lyskom-sessions-with-unread-letters