From: yamaoka <yamaoka>
Date: Tue, 3 Jul 2001 22:15:36 +0000 (+0000)
Subject: Synch with Oort Gnus (includes YAGI-san's fix).
X-Git-Tag: t-gnus-6_15_4-02-quimby-last-~1
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=273688f9685956b07b7dcd470fb73e30f9541744;p=elisp%2Fgnus.git-

Synch with Oort Gnus (includes YAGI-san's fix).
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index fb30f69..0b0823c 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,18 @@
+2001-06-30  YAGI Tatsuya  <yagi@is.titech.ac.jp>
+
+	* gnus-start.el (gnus-check-first-time-used): Use `if' instead of
+	`when'.
+	
+2001-07-03  Simon Josefsson  <jas@extundo.com>
+	From Nuutti Kotivuori <nuutti.kotivuori@smarttrust.com>
+
+	* flow-fill.el (fill-flowed): Use (1+ (point-at-eol)) instead.
+
+2001-07-03  Simon Josefsson  <jas@extundo.com>
+
+	* flow-fill.el (fill-flowed): If `fill-region' inserts empty line,
+	remove it (workaround XEmacs `fill-region' bug).
+
 2001-07-01  Simon Josefsson  <jas@extundo.com>
 
 	* nnimap.el (nnimap-date-days-ago): Defeat locale.
diff --git a/lisp/flow-fill.el b/lisp/flow-fill.el
index 64946f9..6150d51 100644
--- a/lisp/flow-fill.el
+++ b/lisp/flow-fill.el
@@ -95,7 +95,7 @@
 	  (unless sig
 	    (let ((fill-prefix (when quote (concat quote " "))))
 	      (fill-region (fill-flowed-point-at-bol)
-			   (fill-flowed-point-at-eol)
+			   (1+ (fill-flowed-point-at-eol))
 			   'left 'nosqueeze))))))))
 
 (provide 'flow-fill)
diff --git a/lisp/gnus-start.el b/lisp/gnus-start.el
index c02293f..0c39383 100644
--- a/lisp/gnus-start.el
+++ b/lisp/gnus-start.el
@@ -1196,22 +1196,22 @@ for new groups, and subscribe the new groups as zombies."
     (let ((groups (or gnus-default-subscribed-newsgroups
 		      gnus-backup-default-subscribed-newsgroups))
 	  group)
-      (when (eq groups t)
-	;; If t, we subscribe (or not) all groups as if they were new.
-	(mapatoms
-	 (lambda (sym)
-	   (when (setq group (symbol-name sym))
-	     (let ((do-sub (gnus-matches-options-n group)))
-	       (cond
-		((eq do-sub 'subscribe)
-		 (gnus-sethash group group gnus-killed-hashtb)
-		 (gnus-call-subscribe-functions
-		  gnus-subscribe-options-newsgroup-method group))
-		((eq do-sub 'ignore)
-		 nil)
-		(t
-		 (push group gnus-killed-list))))))
-	 gnus-active-hashtb)
+      (if (eq groups t)
+	  ;; If t, we subscribe (or not) all groups as if they were new.
+	  (mapatoms
+	   (lambda (sym)
+	     (when (setq group (symbol-name sym))
+	       (let ((do-sub (gnus-matches-options-n group)))
+		 (cond
+		  ((eq do-sub 'subscribe)
+		   (gnus-sethash group group gnus-killed-hashtb)
+		   (gnus-call-subscribe-functions
+		    gnus-subscribe-options-newsgroup-method group))
+		  ((eq do-sub 'ignore)
+		   nil)
+		  (t
+		   (push group gnus-killed-list))))))
+	   gnus-active-hashtb)
 	(dolist (group groups)
 	  ;; Only subscribe the default groups that are activated.
 	  (when (gnus-active group)