From: yamaoka <yamaoka>
Date: Tue, 6 Dec 2005 15:36:57 +0000 (+0000)
Subject: Synch to No Gnus 200512061446.
X-Git-Tag: t-gnus-6_17_4-quimby-~191
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=adf723ba492586ef313a521731cf58e48a2eb9b9;p=elisp%2Fgnus.git-

Synch to No Gnus 200512061446.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c8cbae5..e0b93e8 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2005-12-06  Reiner Steib  <Reiner.Steib@gmx.de>
+
+	* nntp.el (nntp-marks-directory): Fix custom group.
+
+	* gnus-fun.el (gnus-face-from-file): Decrease quant in smaller
+	steps when < 10.
+
 2005-12-02  ARISAWA Akihiro  <ari@mbf.ocn.ne.jp>  (tiny change)
 
 	* mm-view.el (mm-inline-text-html-render-with-w3m): Fix misplaced
diff --git a/lisp/gnus-fun.el b/lisp/gnus-fun.el
index 8073c57..01c44e1 100644
--- a/lisp/gnus-fun.el
+++ b/lisp/gnus-fun.el
@@ -172,7 +172,7 @@ different input formats."
 			 quant))))
 	(if (> (length attempt) 726)
 	    (progn
-	      (setq quant (- quant 2))
+	      (setq quant (- quant (if (< quant 10) 1 2)))
 	      (gnus-message 9 "Length %d; trying quant %d"
 			    (length attempt) quant))
 	  (setq done t)))
diff --git a/lisp/nntp.el b/lisp/nntp.el
index e568cf4..265958b 100644
--- a/lisp/nntp.el
+++ b/lisp/nntp.el
@@ -234,7 +234,7 @@ See `nnml-marks-is-evil' for more information.")
 (defcustom nntp-marks-directory
   (nnheader-concat gnus-directory "marks/")
   "*The directory where marks for nntp groups will be stored."
-  :group 'gnus
+  :group 'nntp
   :type 'directory)
 
 (defcustom nntp-authinfo-file "~/.authinfo"