Lite fixar

src/ChangeLog

+Fri Jul 19 18:29:41 1996  David Kgedal  <davidk@lysator.liu.se>
+
+	* view-text.el (lyskom-follow-comments): Det stod comments p ett
+ 	stllet dr det skulle ha sttt footnotes.
+
+Thu Jul 18 10:53:36 1996  David Kgedal  <davidk@lysator.liu.se>
+
+	* commands1.el (kom-status-session): Ny kod frn David.
+
+	* view-text.el (lyskom-follow-comments): Frskte lsa hemliga
+ 	kommentarer om kom-follow-comments-outside-membership var t.
+  	Gjorde om frsket att f fotnoter att lsas frst om
+ 	kom-show-footnotes-immediately r nil. Frhoppningsvis lyckades
+ 	det den hr gngen (Jag tjuvkikade p 0.38.2).
+
 Thu Jul 18 10:18:13 1996  David Byers  <davby@sen2.ida.liu.se>
 
 	* lyskom-rest.el (lyskom-format-conf-type): Bugfix (det fungerade
@@ -11,6 +26,11 @@ Wed Jul 17 11:35:10 1996  David Byers  <davby@sen2.ida.liu.se>
  	alltid texter man skriver sjlv.) Detta gr att det gr snabbare
  	att skicka personliga svar.
 
+Wed Jul 17 01:07:40 1996  David Kgedal  <davidk@lysator.liu.se>
+
+	* view-text.el (lyskom-follow-comments): Frskte fixa s att
+ 	fotnoter fr lsas frst om kom-show-footnotes-immediately r nil.
+
 Tue Jul 16 10:25:47 1996  David Byers  <davby@sen2.ida.liu.se>
 
 	* swedish-strings.el (lyskom-strings): Bytte \345 -> \344 p en

src/commands1.el

@@ -1638,7 +1638,7 @@ If MARK-NO == 0, review all marked texts."
 
 (defun lyskom-return-username (who-info)
   "Takes the username from the WHO-INFO and returns it on a better format."
-  (let* ((username (if (eq 'SESSION-INFO who-info)
+  (let* ((username (if (eq 'SESSION-INFO who-info) ; Weird...
                        (session-info->username who-info)
                      (who-info->username who-info)))
 	 (type (or 
@@ -1677,17 +1677,15 @@ If MARK-NO == 0, review all marked texts."
 Optional argument ARG should be a list of sessions to get information
 about or a single session number."
   (interactive)
-  (let ((sessions (or arg
+  (let ((sessions (or (cond ((listp arg) arg)
+                            ((numberp arg) (list arg)))
                       (lyskom-read-session-no 
                        (lyskom-get-string 'status-for-session))))
         (who-info (listify-vector (blocking-do 'who-is-on))))
-    (cond ((listp arg))
-          ((numberp arg) (list arg))
-          (t (setq arg (lyskom-read-session-no 
-                        (lyskom-get-string 'status-for-session)))))
     (mapcar (function (lambda (x) (lyskom-status-session x who-info)))
             sessions)))
 
+
 (defun lyskom-status-session (sid who-info)
   "Show session status for session SID. WHO-INFO is a list of
 WHO-INFOS that are potential sessions."

src/view-text.el

@@ -173,6 +173,8 @@ Note that this function must not be called asynchronously."
 		       (lyskom-view-text-handle-saved-comments text-stat))
 		   
 		   (if (or follow-comments
+			   ;; Checking build-review-tree should not be
+			   ;; necessary, really /davidk
 			   build-review-tree)
 		       ;; This shows footnotes also.
 		       (lyskom-follow-comments text-stat conf-stat mark-as-read
@@ -200,7 +202,7 @@ lyskom-reading-list."
   ;; . Fix the reading-list
   ;; . Issue cache-filling initiate-calls for everything left comments.
   
-  (let ((list))
+  (let (flist clist)
     (lyskom-traverse misc (text-stat->misc-info-list text-stat)
       (cond
        ((and (eq (misc-info->type misc) 'FOOTN-IN)
@@ -211,17 +213,20 @@ lyskom-reading-list."
 			  mark-as-read t conf-stat priority review-tree)
 	(lyskom-is-read (misc-info->footn-in misc)))
        ((eq (misc-info->type misc) 'FOOTN-IN)
-	(setq list (cons (misc-info->footn-in misc) list)))
+	(setq flist (cons (misc-info->footn-in misc) flist)))
        ((eq (misc-info->type misc) 'COMM-IN)
         (if lyskom-show-comments        ; +++SOJGE
-            (setq list (cons (misc-info->comm-in misc) list))))))
-
-    (let ((comments nil))
-      (lyskom-traverse no list
-	(cond
-	 ((or review-tree
-	      (not (lyskom-text-read-p (blocking-do 'get-text-stat no))))
-	  (setq comments (cons no comments)))))
+            (setq clist (cons (misc-info->comm-in misc) clist))))))
+    
+    (let (comments footnotes)
+      ;; Find the comments that we should read and enter them into the
+      ;; read-list.
+      (lyskom-traverse no clist
+	(let ((text-stat (blocking-do 'get-text-stat no)))
+	  (if (or review-tree
+		  (and text-stat
+		       (not (lyskom-text-read-p text-stat))))
+	      (setq comments (cons no comments)))))
       (if comments
 	  (read-list-enter-read-info
 	   (lyskom-create-read-info (if review-tree 'REVIEW-TREE 'COMM-IN)
@@ -229,10 +234,22 @@ lyskom-reading-list."
 				    (lyskom-create-text-list comments)
 				    (text-stat->text-no text-stat))
 	   lyskom-reading-list t))
-      ;; We have most of the text stats in the cache...
-      ;; Just a few stray things to fill the cache...
-      (lyskom-traverse no comments
-	(initiate-get-text-stat 'fill-cache 'lyskom-fetch-text-for-cache no)))))
+      ;; Find the footnotes that we should read and enter them into
+      ;; the read-list. A slight trick is to increase the priority so
+      ;; that they will be read first.
+      (lyskom-traverse no flist
+	(let ((text-stat (blocking-do 'get-text-stat no)))
+	  (if (or review-tree
+		  (and text-stat
+		       (not (lyskom-text-read-p text-stat))))
+	      (setq footnotes (cons no footnotes)))))
+      (if footnotes
+	  (read-list-enter-read-info
+	   (lyskom-create-read-info (if review-tree 'REVIEW-TREE 'FOOTN-IN)
+				    conf-stat (1+ priority)
+				    (lyskom-create-text-list footnotes)
+				    (text-stat->text-no text-stat))
+	   lyskom-reading-list t)))))
 
 
 (defun lyskom-fetch-text-for-cache (text-stat)