(gnus-summary-exit): Undo last change and fix it in a more conservative way.

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 7ade85487649ef82c170d53c63ae1de59e1983a3..11b93e2df0c737bb4cc021e21dbc66fd66858ed8 100644 (file)
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,11 +1,16 @@
+2005-03-01  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * gnus-sum.el (gnus-summary-exit): Undo last change and fix it in
+       a more conservative way.
+
 2005-02-27  Arne J\e,Ax\e(Brgensen  <arne@arnested.dk>
 
        * mm-decode.el (mm-dissect-buffer): Pass the from field on to
        `mm-dissect-multipart' and receive the from field as an (optional)
        argument from `mm-dissect-multipart'.
        (mm-dissect-multipart): Receive the from field as an argument and
-       pass it on when we call `mm-dissect-buffer' on MIME parts. Fixes
-       verification/decryption of signed/encrypted MIME parts.
+       pass it on when we call `mm-dissect-buffer' on MIME parts.
+       Fixes verification/decryption of signed/encrypted MIME parts.
 
 2005-02-26  Stefan Monnier  <monnier@iro.umontreal.ca>
 

diff --git a/lisp/gnus/gnus-sum.el b/lisp/gnus/gnus-sum.el
index 73ac963bd3b7ad5806eb2559bfa0eff43bb583e9..ea8f7e063fe39e8e3bb0ad12e9b49e0ef956488f 100644 (file)
--- a/lisp/gnus/gnus-sum.el
+++ b/lisp/gnus/gnus-sum.el
@@ -6680,11 +6680,13 @@ 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)
+       ;; If gnus-group-buffer is already displayed, make sure we also move
+       ;; the cursor in the window that displays it.
+       (let ((win (get-buffer-window (current-buffer) 0)))
+         (if win (set-window-point win (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))
+         (gnus-configure-windows 'group 'force)))
       ;; Clear the current group name.
       (unless quit-config
        (setq gnus-newsgroup-name nil)))))