Removed kom-set-keep-commented and put the functionality in kom-set-garb-nice.

Detailed changes:
> 	Fix bug 1117:
> 	* commands2.el (kom-set-garb-nice): Moved kom-set-keep-commented
> 	into this function. It makes more sense that way.
> 	(kom-set-keep-commented): Deleted this command.

src/ChangeLog

 2003-08-28  David Byers  <byers@lysator.liu.se>
 
+	Fix bug 1117:
+	* commands2.el (kom-set-garb-nice): Moved kom-set-keep-commented
+	into this function. It makes more sense that way.
+	(kom-set-keep-commented): Deleted this command.
+
 	Fix bug 1128:
 	* commands2.el (kom-limit-import): Support refusing HTML import.
 
@@ -13,7 +18,7 @@
 
 	* compatibility.el (string-to-vector): Don't just compute the
  	result. Return it too...
-	
+
 	* utilities.el (lyskom-completing-read): Protect the value of
 	this-command from alteration.
 	(lyskom-read-from-minibuffer): Same here.

src/commands2.el

@@ -1474,38 +1474,29 @@ than the garbage collection time of all its recipients."
                                           '(all) nil nil t)))
     (if (not conf-stat)
         (lyskom-insert-string 'somebody-deleted-that-conf)
-      (let ((garb-nice (lyskom-read-number 'new-garb-nice-q)))
-        (lyskom-format-insert 'garb-nice-for-is
-                              conf-stat
-                              garb-nice)
+      (let ((garb-nice (lyskom-read-number 'new-garb-nice-q
+                                           (conf-stat->garb-nice conf-stat)))
+            (keep-commented
+             (lyskom-read-number 'new-keep-commented-q
+                                 (conf-stat->keep-commented conf-stat))))
+        (lyskom-format-insert 'garb-nice-for-is conf-stat garb-nice)
         (if (not (blocking-do 'set-garb-nice
                               (conf-stat->conf-no conf-stat) 
                               garb-nice))
             (lyskom-insert-string 'nope) ;+++lyskom-errno
           (lyskom-insert-string 'done)
-          (cache-del-conf-stat (conf-stat->conf-no conf-stat)))))))
+          (cache-del-conf-stat (conf-stat->conf-no conf-stat))
 
-(def-kom-command kom-set-keep-commented ()
-  "Set the minimum number of days a commented text is kept in conference
-after the most recent comment was written. Texts in a conference will
-eventually be deleted automatically \(this process is called garbage
-collection). This can only happen when a text is older than the
-garbage collection time of all its recipients."
-  (interactive)
-  (let ((conf-stat (lyskom-read-conf-stat 'conf-to-set-keep-commented-q
-                                          '(all) nil nil t)))
-    (if (not conf-stat)
-        (lyskom-insert-string 'somebody-deleted-that-conf)
-      (let ((keep-commented (lyskom-read-number 'new-keep-commented-q)))
-        (lyskom-format-insert 'keep-commented-for-is
-                              conf-stat
-                              keep-commented)
-        (if (not (blocking-do 'set-keep-commented
-                              (conf-stat->conf-no conf-stat) 
-                              keep-commented))
-            (lyskom-insert-string 'nope) ;+++lyskom-errno
-          (lyskom-insert-string 'done)
-          (cache-del-conf-stat (conf-stat->conf-no conf-stat)))))))
+          (sit-for 0)
+          (lyskom-format-insert 'keep-commented-for-is
+                                conf-stat
+                                keep-commented)
+          (if (not (blocking-do 'set-keep-commented
+                                (conf-stat->conf-no conf-stat) 
+                                keep-commented))
+              (lyskom-insert-string 'nope) ;+++lyskom-errno
+            (lyskom-insert-string 'done)
+            (cache-del-conf-stat (conf-stat->conf-no conf-stat))))))))
 
 
 ;;; ================================================================

src/english-strings.el

@@ -825,7 +825,6 @@ Mark the envelope with \"LysKOM bug report\"\n\n")
     (submitters-conf-for-is . "Changing authors admitted to conference %#1M to the members of %#2M...") 
    
     (conf-to-set-garb-nice-q . "Set expiration time for which conference? ")
-    (conf-to-set-keep-commented-q . "Set minimum expiration time for commented texts in which conference? ")
     (new-keep-commented-q . "How many days shall new comments protect texts from removal? ")
     (new-garb-nice-q . "After how many days shall texts be removed? ")
     (garb-nice-for-is . "Changing expiration for %#1M to %#2d day%#2?d%[%]%[s%]...")
@@ -2225,7 +2224,6 @@ written a presentation.%]
     (kom-list-server-faqs     . "List server-FAQs")
     (kom-list-new-conferences . "List new conferences")
     (kom-list-new-persons     . "List new users")
-    (kom-set-keep-commented   . "Change minimum expiration (for commented texts)")
     ))
 
 (lyskom-language-var global lyskom-language-codes en

src/swedish-strings.el

@@ -857,7 +857,6 @@ M
     (submitters-conf-for-is . "ndra tilltna frfattare fr mte %#1M till\nmedlemmarna i %#2M...")
 
     (conf-to-set-garb-nice-q . "Vilket mte vill du stta livslngd fr? ")
-    (conf-to-set-keep-commented-q . "Fr vilket mte vill du stta minsta livslngd fr kommenterade texter? ")
     (new-garb-nice-q . "Efter hur mnga dagar ska inlgg utplnas? ")
     (new-keep-commented-q . "Hur mnga dagar nya kommentarer skydda det kommenterade? ")
     (garb-nice-for-is . "ndrar livslngden fr %#1M till %#2d dag%#2?d%[%]%[ar%]...")
@@ -2254,7 +2253,6 @@ att upprepas d
     (kom-list-server-faqs     . "Lista server-FAQ")
     (kom-list-new-conferences . "Lista nya mten")
     (kom-list-new-persons     . "Lista nya personer")
-    (kom-set-keep-commented   . "ndra minsta livslngd (fr kommenterade inlgg)")
     ))
 
 (lyskom-language-var local lyskom-language-codes sv

src/vars.el.in

@@ -382,7 +382,6 @@ the priority among links that match the same text is undefined."
     (kom-status-conf (conf-for-status))
     (kom-status-session (session-for-status))
     (kom-status-person (pers-for-status))
-    (kom-set-keep-commented (conf-to-set-keep-commented-q))
     (kom-set-garb-nice (conf-to-set-garb-nice-q))
     (kom-set-super-conf (conf-to-set-super-conf-q) (new-super-conf-q))
     (kom-set-personal-label (label-what-pers) (label-what-conf))
@@ -3306,7 +3305,6 @@ Users are encouraged to use their best sense of humor."
     kom-list-server-faqs
     kom-list-new-conferences
     kom-list-new-persons
-    kom-set-keep-commented
     ))
 
 ;;; ================================================================