From: yamaoka <yamaoka>
Date: Tue, 21 Oct 2003 14:33:19 +0000 (+0000)
Subject: Synch to Gnus 200310211428.
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f22056b1955b6a118861543284558e4aa13ff30f;p=elisp%2Fgnus.git-

Synch to Gnus 200310211428.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 366fa07..34ccf4e 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,16 @@
+2003-10-21  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* gnus-art.el (gnus-narrow-to-page): Clear as well as set the
+	value for gnus-page-broken.
+
+	* gnus-sum.el (gnus-summary-beginning-of-article): Use
+	gnus-break-pages instead of gnus-page-broken.
+	(gnus-summary-end-of-article): Use gnus-break-pages instead of
+	gnus-page-broken; narrow to the end of a page beforehand.
+	(gnus-summary-toggle-header): Use gnus-break-pages instead of
+	gnus-page-broken; remove delimiter buttons unless gnus-break-pages
+	is non-nil.
+
 2003-10-21  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
 	* gnus-picon.el (gnus-picon-transform-address): Protect against
diff --git a/lisp/gnus-art.el b/lisp/gnus-art.el
index 0649772..21ddb51 100644
--- a/lisp/gnus-art.el
+++ b/lisp/gnus-art.el
@@ -5316,13 +5316,16 @@ If given a numerical ARG, move forward ARG pages."
       (let ((buffer-read-only nil))
 	(gnus-remove-text-with-property 'gnus-prev)
 	(gnus-remove-text-with-property 'gnus-next)))
-    (when
+    (if
 	(cond ((< arg 0)
 	       (re-search-backward page-delimiter nil 'move (1+ (abs arg))))
 	      ((> arg 0)
 	       (re-search-forward page-delimiter nil 'move arg)))
-      (setq gnus-page-broken t)
-      (goto-char (match-end 0)))
+	(goto-char (match-end 0))
+      (save-excursion
+	(goto-char (point-min))
+	(setq gnus-page-broken
+	      (and (re-search-forward page-delimiter nil t) t))))
     (when gnus-page-broken
       (narrow-to-region
        (point)
diff --git a/lisp/gnus-sum.el b/lisp/gnus-sum.el
index 3a4aab6..e38a232 100644
--- a/lisp/gnus-sum.el
+++ b/lisp/gnus-sum.el
@@ -8621,7 +8621,7 @@ article.  If BACKWARD (the prefix) is non-nil, search backward instead."
   (gnus-eval-in-buffer-window gnus-article-buffer
     (widen)
     (goto-char (point-min))
-    (when gnus-page-broken
+    (when gnus-break-pages
       (gnus-narrow-to-page))))
 
 (defun gnus-summary-end-of-article ()
@@ -8633,7 +8633,9 @@ article.  If BACKWARD (the prefix) is non-nil, search backward instead."
     (widen)
     (goto-char (point-max))
     (recenter -3)
-    (when gnus-page-broken
+    (when gnus-break-pages
+      (when (re-search-backward page-delimiter nil t)
+	(narrow-to-region (match-end 0) (point-max)))
       (gnus-narrow-to-page))))
 
 (defun gnus-summary-print-truncate-and-quote (string &optional len)
@@ -8820,10 +8822,12 @@ If ARG is a negative number, hide the unwanted header lines."
 	(widen)
 	(if window
 	    (set-window-start window (goto-char (point-min))))
-	(setq gnus-page-broken
-	      (when gnus-break-pages
-		(gnus-narrow-to-page)
-		t))
+	(if gnus-break-pages
+	    (gnus-narrow-to-page)
+	  (when (gnus-visual-p 'page-marker)
+	    (let ((buffer-read-only nil))
+	      (gnus-remove-text-with-property 'gnus-prev)
+	      (gnus-remove-text-with-property 'gnus-next))))
 	(gnus-set-mode-line 'article)))))
 
 (defun gnus-summary-show-all-headers ()