Synch to No Gnus 200502260709.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0f28d3c..2c93ab5 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2005-02-26  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * gnus-sum.el (gnus-summary-exit): Move point after displaying the
+       buffer, so it moves the window's cursor.
+
 2005-02-26  Arne J\e,Ax\e(Brgensen  <arne@arnested.dk>
 
        * mm-decode.el (mm-dissect-buffer): Pass the from field on to
@@ -20,14 +25,13 @@
 
 2005-02-24  Reiner Steib  <Reiner.Steib@gmx.de>
 
-       * nnheader.el (nnheader-find-file-noselect): Added doc string.
+       * nnheader.el (nnheader-find-file-noselect): Add doc string.
 
        * nnfolder.el (nnfolder-read-folder): Use RAWFILE for
-       `nnheader-find-file-noselect' to avoid
-       `large-file-warning-threshold'.
+       `nnheader-find-file-noselect' to avoid `large-file-warning-threshold'.
 
-       * gnus-sum.el (gnus-summary-caesar-message): Apply
-       `gnus-treat-article' after rotation.
+       * gnus-sum.el (gnus-summary-caesar-message):
+       Apply `gnus-treat-article' after rotation.
 
        * gnus-group.el (gnus-group-clear-data): Mention process/prefix in
        doc string.
@@ -92,7 +96,7 @@
 
 2005-02-16  Teodor Zlatanov  <tzz@lifelogs.com>
 
-       * gnus-registry.el (gnus-registry-delete-group): minor bug fix
+       * gnus-registry.el (gnus-registry-delete-group): Minor bug fix.
 
        * gnus.el (gnus-install-group-spam-parameters): Doc fix.
 

diff --git a/lisp/gnus-sum.el b/lisp/gnus-sum.el
index 3edd3f9..8ca471e 100644 (file)
--- a/lisp/gnus-sum.el
+++ b/lisp/gnus-sum.el
@@ -6727,13 +6727,15 @@ If FORCE (the prefix), also save the .newsrc file(s)."
       (set-buffer gnus-group-buffer)
       (if quit-config
          (gnus-handle-ephemeral-exit quit-config)
-       (goto-char group-point)
        (unless leave-hidden
          (gnus-configure-windows 'group 'force))
+       ;; Move point after calling gnus-configure-windows to make sure it
+       ;; moves the window's point as well.
+       (goto-char group-point)
        (unless (pos-visible-in-window-p)
          (forward-line (/ (static-if (featurep 'xemacs)
-                                     (window-displayed-height)
-                                     (1- (window-height)))
+                              (window-displayed-height)
+                            (1- (window-height)))
                           -2))
          (set-window-start (selected-window) (point))
          (goto-char group-point)))