Revision: miles@gnu.org--gnu-2005/gnus--devo--0--patch-59

Merge from gnus--rel--5.10

Patches applied:

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0  (patch 139, 143)

   - Merge from gnus--rel--5.10
   - Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10  (patch 34)

   - Merge from emacs--cvs-trunk--0

2005-03-01  Stefan Monnier  <monnier@iro.umontreal.ca>

   * lisp/gnus-sum.el (gnus-summary-exit): Undo last change and fix it in
   a more conservative way.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4896d87..b4806aa 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+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-26  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * gnus-sum.el (gnus-summary-exit): Move point after displaying the
@@ -9,8 +14,8 @@
        `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-25  Teodor Zlatanov  <tzz@lifelogs.com>
 

diff --git a/lisp/gnus-sum.el b/lisp/gnus-sum.el
index b423907..42613bb 100644 (file)
--- a/lisp/gnus-sum.el
+++ b/lisp/gnus-sum.el
@@ -6731,11 +6731,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)))))