From: yamaoka <yamaoka>
Date: Sat, 25 Feb 2006 00:07:53 +0000 (+0000)
Subject: Synch to No Gnus 200602242253.
X-Git-Tag: t-gnus-6_17_4-quimby-~72
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1270affddb81ba2dab7d9e1c6c6370b05c762e37;p=elisp%2Fgnus.git-

Synch to No Gnus 200602242253.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8171353..e035927 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,15 @@
+2006-02-24  Andreas Seltenreich  <uwi7@rz.uni-karlsruhe.de>
+
+	* nnweb.el (nnweb-gmane-create-mapping): Don't choke on ^M.
+
+2006-02-20  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+	* gnus-int.el (gnus-open-server): Respect gnus-batch-mode.
+
+2005-12-20  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+	* dns.el (query-dns): Protect more against buggy tcp output.
+
 2006-02-24  Reiner Steib  <Reiner.Steib@gmx.de>
 
 	* nnweb.el (nnweb-type-definition, nnweb-gmane-search): Use new
diff --git a/lisp/dns.el b/lisp/dns.el
index a3937f3..f9dd17f 100644
--- a/lisp/dns.el
+++ b/lisp/dns.el
@@ -410,7 +410,7 @@ If REVERSEP, look up an IP address."
 		     (>= (buffer-size) 2))
 	    (goto-char (point-min))
 	    (delete-region (point) (+ (point) 2)))
-	  (unless (zerop (buffer-size))
+	  (when (>= (buffer-size) 2)
 	    (let ((result (dns-read (buffer-string))))
 	      (if fullp
 		  result
diff --git a/lisp/gnus-int.el b/lisp/gnus-int.el
index 1e9637f..32b371d 100644
--- a/lisp/gnus-int.el
+++ b/lisp/gnus-int.el
@@ -251,10 +251,12 @@ If it is down, start it up (again)."
                               ;; recurse to open the agent's backend.
                               (setq open-offline (eq gnus-server-unopen-status 'offline))
                               gnus-server-unopen-status)
-                             ((gnus-y-or-n-p
-                               (format "Unable to open %s:%s, go offline? "
-                                       (car gnus-command-method)
-                                       (cadr gnus-command-method)))
+                             ((and
+			       (not gnus-batch-mode)
+			       (gnus-y-or-n-p
+				(format "Unable to open %s:%s, go offline? "
+					(car gnus-command-method)
+					(cadr gnus-command-method))))
                               (setq open-offline t)
                               'offline)
                              (t
diff --git a/lisp/nnweb.el b/lisp/nnweb.el
index 3dd7cee..1e4a8ea 100644
--- a/lisp/nnweb.el
+++ b/lisp/nnweb.el
@@ -471,7 +471,7 @@ Valid types include `google', `dejanews', and `gmane'.")
 	(forward-line 1)
 	;; Thanks to Olly Betts we now have NOV lines in our buffer!
 	(while (not (eobp))
-	  (unless (eolp)
+	  (unless (or (eolp) (looking-at "\x0d"))
 	    (let ((header (nnheader-parse-nov)))
 	      (let ((xref (mail-header-xref header))
 		    (from (mail-header-from header))
diff --git a/texi/gnus-ja.texi b/texi/gnus-ja.texi
index 78310ab..f6637e5 100644
--- a/texi/gnus-ja.texi
+++ b/texi/gnus-ja.texi
@@ -921,7 +921,7 @@ New Features
 * Quassia Gnus::                2 かける 2 は 4、もしくは Gnus 5.6/5.7
 * Pterodactyl Gnus::            神秘の数も P で始まるけれど。Gnus 5.8/5.9 の別名
 * Oort Gnus::                   巨大な。遠く遥かな。Gnus 5.10/5.11。
-* No Gnus::                     Lars さん、直して!
+* No Gnus::                     Very punny.
 
 Customization
 
diff --git a/texi/gnus.texi b/texi/gnus.texi
index 719dd6c..08d2cf8 100644
--- a/texi/gnus.texi
+++ b/texi/gnus.texi
@@ -910,7 +910,7 @@ New Features
 * Quassia Gnus::                Two times two is four, or Gnus 5.6/5.7.
 * Pterodactyl Gnus::            Pentad also starts with P, AKA Gnus 5.8/5.9.
 * Oort Gnus::                   It's big.  It's far out.  Gnus 5.10/5.11.
-* No Gnus::                     Lars, FIXME!
+* No Gnus::                     Very punny. 
 
 Customization