From: yamaoka <yamaoka>
Date: Thu, 18 Jul 2002 12:53:55 +0000 (+0000)
Subject: * gnus-namazu.el (gnus-namazu/truncate-article-list): Remove a redundancy;
X-Git-Tag: t-gnus-6_15_7-00~2
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=f95e6d18cbb0d974490528f66de8ff0e7cfd63d3;p=elisp%2Fgnus.git-

* gnus-namazu.el (gnus-namazu/truncate-article-list): Remove a redundancy;
 when `gnus-large-newsgroup' is equal to nil, no confirmation is required.
---

diff --git a/ChangeLog b/ChangeLog
index 1545a78..d338949 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2002-07-18  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* lisp/gnus-namazu.el (gnus-namazu/truncate-article-list): Remove
+	a redundancy.
+
+2002-06-25  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* lisp/gnus-namazu.el (gnus-namazu/truncate-article-list): When
+	`gnus-large-newsgroup' is equal to nil, no confirmation is
+	required.
+
 2002-07-04  Katsumi Yamaoka  <yamaoka@jpl.org>
 
 	* lisp/dgnushack.el (byte-optimize-form-code-walker): Don't modify
diff --git a/lisp/gnus-namazu.el b/lisp/gnus-namazu.el
index 458729d..6883870 100644
--- a/lisp/gnus-namazu.el
+++ b/lisp/gnus-namazu.el
@@ -534,19 +534,18 @@ generate possible group names from it."
 
 (defun gnus-namazu/truncate-article-list (articles)
   (let ((hit (length articles)))
-    (when (> hit gnus-large-newsgroup)
+    (when (and gnus-large-newsgroup
+	       (> hit gnus-large-newsgroup))
       (let* ((cursor-in-echo-area nil)
-	     (input
-	      (when (> hit gnus-large-newsgroup)
-		(read-from-minibuffer
-		 (format
-		  "Too many articles were retrieved.  How many articles (max %d): "
-		  hit)
-		 (cons (number-to-string gnus-large-newsgroup) 0)))))
+	     (input (read-from-minibuffer
+		     (format "\
+Too many articles were retrieved.  How many articles (max %d): "
+			     hit)
+		     (cons (number-to-string gnus-large-newsgroup) 0))))
 	(unless (string-match "\\`[ \t]*\\'" input)
 	  (setcdr (nthcdr (min (1- (string-to-number input)) hit) articles)
-		  nil))))
-    articles))
+		  nil)))))
+  articles)
 
 ;;;###autoload
 (defun gnus-namazu-search (groups query)