From: yamaoka <yamaoka>
Date: Wed, 23 Jun 1999 10:16:22 +0000 (+0000)
Subject: (gnus-articles-to-read): Use `read-from-minibuffer' instead of `read-string'.
X-Git-Tag: et-gnus-6_11_03-06~2
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f5fe35bb6f3bc335551bc2e5ee7cf4b61734a9f7;p=elisp%2Fgnus.git-

(gnus-articles-to-read): Use `read-from-minibuffer' instead of `read-string'.
(TopLevel): Require `static'.
---

diff --git a/lisp/gnus-sum.el b/lisp/gnus-sum.el
index 6b4a5a6..7ff3cb9 100644
--- a/lisp/gnus-sum.el
+++ b/lisp/gnus-sum.el
@@ -40,10 +40,10 @@
 
 (eval-when-compile
   (require 'mime-play)
-  ;; Avoid byte-compile warnings.
-  (defvar gnus-article-decoded-p)
-  (defvar gnus-decode-encoded-word-function)
-  )
+  (require 'static))
+
+;; Avoid byte-compile warnings.
+(defvar gnus-decode-encoded-word-function)
 
 (eval-and-compile
   (autoload 'gnus-cache-articles-in-group "gnus-cache"))
@@ -4147,15 +4147,16 @@ If SELECT-ARTICLES, only select those articles from GROUP."
 		 ((and (or (<= scored marked) (= scored number))
 		       (natnump gnus-large-newsgroup)
 		       (> number gnus-large-newsgroup))
-		  (let* ((minibuffer-setup-hook (append
-						 minibuffer-setup-hook
-						 '(beginning-of-line)))
-			 (input (read-string
-				 (format
-				  "How many articles from %s (max %d): "
-				  (gnus-limit-string gnus-newsgroup-name 35)
-				  number)
-				 (number-to-string gnus-large-newsgroup))))
+		  (let ((input (read-from-minibuffer
+				(format
+				 "How many articles from %s (max %d): "
+				 (gnus-limit-string gnus-newsgroup-name 35)
+				 number)
+				(static-if (< emacs-major-version 20)
+				    (number-to-string gnus-large-newsgroup)
+				  (cons
+				   (number-to-string gnus-large-newsgroup)
+				   0)))))
 		    (if (string-match "^[ \t]*$" input)
 			number
 		      input)))