# HG changeset patch
# User Miles Bader <miles@gnu.org>
# Date 1218556865 0
# Node ID 9400faffc3f151949e8b2f472fdb8fe78dcd04b1
# Parent  fbac0341183c4dff4aabf8214a860fe02865724c
Merge from gnus--devo--0

Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1376

diff -r fbac0341183c -r 9400faffc3f1 lisp/gnus/ChangeLog
--- a/lisp/gnus/ChangeLog	Tue Aug 12 15:54:59 2008 +0000
+++ b/lisp/gnus/ChangeLog	Tue Aug 12 16:01:05 2008 +0000
@@ -1,3 +1,21 @@
+2008-08-11  Ralf Angeli  <angeli@caeruleus.net>
+
+	* gnus-art.el (gnus-article-next-page): Respect `scroll-margin' when
+	moving point to the bottom of the window in order to avoid recentering.
+
+2008-08-11  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* gnus-art.el (gnus-article-next-page, gnus-article-prev-page)
+	(gnus-article-next-page-1): Use compiler directive (featurep 'xemacs).
+	(gnus-article-beginning-of-window): Fix calculation.
+
+2008-08-08  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* gnus-msg.el (gnus-summary-supersede-article)
+	(gnus-summary-resend-message-edit): Bind mail-parse-charset to the
+	value of gnus-newsgroup-charset to decode non-MIME encoded text in
+	message header.
+
 2008-07-31  Dan Nicolaescu  <dann@ics.uci.edu>
 
 	* message.el:
diff -r fbac0341183c -r 9400faffc3f1 lisp/gnus/gnus-art.el
--- a/lisp/gnus/gnus-art.el	Tue Aug 12 15:54:59 2008 +0000
+++ b/lisp/gnus/gnus-art.el	Tue Aug 12 16:01:05 2008 +0000
@@ -6113,13 +6113,12 @@
 If end of article, return non-nil.  Otherwise return nil.
 Argument LINES specifies lines to be scrolled up."
   (interactive "p")
-  (move-to-window-line -1)
+  (move-to-window-line (if (featurep 'xemacs) -1 (- -1 scroll-margin)))
   (if (and (not (and gnus-article-over-scroll
 		     (> (count-lines (window-start) (point-max))
-			(+ (or lines (1- (window-height)))
-			   (or (and (boundp 'scroll-margin)
-				    (symbol-value 'scroll-margin))
-			       0)))))
+			(if (featurep 'xemacs)
+			    (or lines (1- (window-height)))
+			  (+ (or lines (1- (window-height))) scroll-margin)))))
 	   (save-excursion
 	     (end-of-line)
 	     (and (pos-visible-in-window-p)	;Not continuation line.
@@ -6151,19 +6150,19 @@
       (min (max 0 scroll-margin)
 	   (max 1 (- (window-height)
 		     (if mode-line-format 1 0)
-		     (if header-line-format 1 0)))))))
+		     (if header-line-format 1 0)
+		     2))))))
 
 (defun gnus-article-next-page-1 (lines)
-  (when (and (not (featurep 'xemacs))
-	     (numberp lines)
-	     (> lines 0)
-	     (numberp (symbol-value 'scroll-margin))
-	     (> (symbol-value 'scroll-margin) 0))
+  (unless (featurep 'xemacs)
     ;; Protect against the bug that Emacs 21.x hangs up when scrolling up for
     ;; too many number of lines if `scroll-margin' is set as two or greater.
-    (setq lines (min lines
-		     (max 0 (- (count-lines (window-start) (point-max))
-			       (symbol-value 'scroll-margin))))))
+    (when (and (numberp lines)
+	       (> lines 0)
+	       (> scroll-margin 0))
+      (setq lines (min lines
+		       (max 0 (- (count-lines (window-start) (point-max))
+				 scroll-margin))))))
   (condition-case ()
       (let ((scroll-in-place nil))
 	(scroll-up lines))
@@ -6185,9 +6184,9 @@
 	(goto-char (point-max))
 	(recenter (if gnus-article-over-scroll
 		      (if lines
-			  (max (+ lines (or (and (boundp 'scroll-margin)
-						 (symbol-value 'scroll-margin))
-					    0))
+			  (max (if (featurep 'xemacs)
+				   lines
+				 (+ lines scroll-margin))
 			       3)
 			(- (window-height) 2))
 		    -1)))
diff -r fbac0341183c -r 9400faffc3f1 lisp/gnus/gnus-msg.el
--- a/lisp/gnus/gnus-msg.el	Tue Aug 12 15:54:59 2008 +0000
+++ b/lisp/gnus/gnus-msg.el	Tue Aug 12 16:01:05 2008 +0000
@@ -812,7 +812,8 @@
 This is done simply by taking the old article and adding a Supersedes
 header line with the old Message-ID."
   (interactive)
-  (let ((article (gnus-summary-article-number)))
+  (let ((article (gnus-summary-article-number))
+	(mail-parse-charset gnus-newsgroup-charset))
     (gnus-setup-message 'reply-yank
       (gnus-summary-select-article t)
       (set-buffer gnus-original-article-buffer)
@@ -1274,7 +1275,7 @@
 contents of the message, and then, everything will happen as when
 composing a new message."
   (interactive)
-  (let ((article (gnus-summary-article-number)))
+  (let ((mail-parse-charset gnus-newsgroup-charset))
     (gnus-setup-message 'reply-yank
       (gnus-summary-select-article t)
       (set-buffer gnus-original-article-buffer)