From: yamaoka <yamaoka>
Date: Fri, 12 Mar 2004 04:49:37 +0000 (+0000)
Subject: Synch to No Gnus 200403120448.
X-Git-Tag: t-gnus-6_17_4-quimby-~1016
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=dc85cd0a1ba98ab1350d2e22babf7d686cde97eb;p=elisp%2Fgnus.git-

Synch to No Gnus 200403120448.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7140642..7919fea 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,14 @@
+2004-03-12  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* gnus-art.el (gnus-article-read-summary-keys): Restore new
+	window-start and hscroll to summary window.
+
+2004-03-12  Kevin Greiner <kgreiner@xpediantsolutions.com>
+
+	* gnus-start.el (gnus-convert-old-newsrc): Only write the
+	conversion message to newsrc-dribble when an actual conversion is
+	performed.
+
 2004-03-10  Malcolm Purvis <malcolmpurvis@optushome.com.au>  (tiny change)
 
 	* spam-stat.el (spam-stat-coding-system): Use mm-coding-system-p.
diff --git a/lisp/gnus-art.el b/lisp/gnus-art.el
index 00dd3aa..61fb003 100644
--- a/lisp/gnus-art.el
+++ b/lisp/gnus-art.el
@@ -5528,11 +5528,13 @@ not have a face in `gnus-article-boring-faces'."
       (let ((obuf (current-buffer))
 	    (owin (current-window-configuration))
 	    (opoint (point))
-	    (summary gnus-article-current-summary)
-	    func in-buffer selected)
-	(if not-restore-window
-	    (pop-to-buffer summary 'norecord)
-	  (switch-to-buffer summary 'norecord))
+	    win func in-buffer selected new-sum-start new-sum-hscroll)
+	(cond (not-restore-window
+	       (pop-to-buffer gnus-article-current-summary 'norecord))
+	      ((setq win (get-buffer-window gnus-article-current-summary))
+	       (select-window win))
+	      (t
+	       (switch-to-buffer gnus-article-current-summary 'norecord)))
 	(setq in-buffer (current-buffer))
 	;; We disable the pick minor mode commands.
 	(if (and (setq func (let (gnus-pick-mode)
@@ -5540,7 +5542,10 @@ not have a face in `gnus-article-boring-faces'."
 		 (functionp func))
 	    (progn
 	      (call-interactively func)
-	      (setq new-sum-point (point))
+	      (when (eq win (selected-window))
+		(setq new-sum-point (point)
+		      new-sum-start (window-start win)
+		      new-sum-hscroll (window-hscroll win))
 	      (when (eq in-buffer (current-buffer))
 		(setq selected (gnus-summary-select-article))
 		(set-buffer obuf)
@@ -5552,10 +5557,12 @@ not have a face in `gnus-article-boring-faces'."
 				    1)
 		  (set-window-point (get-buffer-window (current-buffer))
 				    (point)))
-		(let ((win (get-buffer-window gnus-article-current-summary)))
-		  (when win
-		    (set-window-point win new-sum-point))))    )
-	  (switch-to-buffer gnus-article-buffer)
+		(when (and (not not-restore-window)
+			   new-sum-point)
+		  (set-window-point win new-sum-point)
+		  (set-window-start win new-sum-start)
+		  (set-window-hscroll win new-sum-hscroll)))))
+	  (set-window-configuration owin)
 	  (ding))))))
 
 (defun gnus-article-describe-key (key)