Synch.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8e5fbb0..bfaf179 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,9 +1,19 @@
+2000-07-03  Stainless Steel Rat <ratinox@peorth.gweep.net>
+
+       * gnus-sum.el (gnus-recenter): Fix horizontal recenter.
+
+2000-07-03  Simon Josefsson  <simon@josefsson.org>
+
+       * gnus-sum.el (gnus-update-marks): Don't propagate download and
+       unsend flags.
+
 2000-07-03  Simon Josefsson  <jas@pdc.kth.se>
 
        * nnimap.el (nnimap-open-connection): Don't look up virtual server
        name in authinfo (.authinfo now support ports, no need for the
        hack).
        (nnimap-split-find-rule): Fix.
+       (nnimap-open-connection): Look for nnimap-server-address in authinfo.
 
 2000-07-03  Paul Stodghill <stodghil@CS.Cornell.EDU>
 

diff --git a/lisp/gnus-sum.el b/lisp/gnus-sum.el
index 4bd1084..9cb5dbb 100644 (file)
--- a/lisp/gnus-sum.el
+++ b/lisp/gnus-sum.el
@@ -4443,9 +4443,14 @@ If SELECT-ARTICLES, only select those articles from GROUP."
        
        (when (gnus-check-backend-function
               'request-set-mark gnus-newsgroup-name)
+         ;; propagate flags to server, with the following exceptions:
          ;; uncompressed:s are not proper flags (they are cons cells)
          ;; cache is a internal gnus flag
-         (unless (memq (cdr type) (cons 'cache uncompressed))
+         ;; download are local to one gnus installation (well)
+         ;; unsend are for nndraft groups only
+         ;; xxx: generality of this?  this suits nnimap anyway
+         (unless (memq (cdr type) (append '(cache download unsend)
+                                          uncompressed))
            (let* ((old (cdr (assq (cdr type) (gnus-info-marks info))))
                   (del (gnus-remove-from-range (gnus-copy-sequence old) list))
                   (add (gnus-remove-from-range
@@ -5174,8 +5179,7 @@ articles with that subject.  If BACKWARD, search backward instead."
   "Center point in window and redisplay frame.
 Also do horizontal recentering."
   (interactive "P")
-  (when (and nil
-            gnus-auto-center-summary
+  (when (and gnus-auto-center-summary
             (not (eq gnus-auto-center-summary 'vertical)))
     (gnus-horizontal-recenter))
   (recenter n))

diff --git a/lisp/nnimap.el b/lisp/nnimap.el
index cfb7597..cd14bc9 100644 (file)
--- a/lisp/nnimap.el
+++ b/lisp/nnimap.el
@@ -543,7 +543,8 @@ If EXAMINE is non-nil the group is selected read-only."
           (port (if nnimap-server-port
                     (int-to-string nnimap-server-port)
                   "imap"))
-          (alist (gnus-netrc-machine list (or nnimap-address server)
+          (alist (gnus-netrc-machine list (or nnimap-server-address 
+                                               nnimap-address server)
                                       port "imap"))
           (user (gnus-netrc-get alist "login"))
           (passwd (gnus-netrc-get alist "password")))