[Emacs-diffs] /srv/bzr/emacs/trunk r101473: Fix previous merge from Gnus trunk.

[Katsumi Yamaoka]

------------------------------------------------------------
revno: 101473
committer: Katsumi Yamaoka <address@hidden>
branch nick: trunk
timestamp: Sat 2010-09-18 10:21:30 +0000
message:
  Fix previous merge from Gnus trunk.
modified:
  lisp/gnus/ChangeLog
  lisp/gnus/pop3.el

=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog       2010-09-17 14:22:06 +0000
+++ b/lisp/gnus/ChangeLog       2010-09-18 10:21:30 +0000
@@ -1,3 +1,103 @@
+2010-09-18  Lars Magne Ingebrigtsen  <address@hidden>
+
+       * gnus-sum.el (gnus-select-newsgroup): Indent.
+
+       * nnimap.el (nnimap-possibly-change-group): Return nil if we can't log
+       in.
+       (nnimap-finish-retrieve-group-infos): Make sure we're not waiting for
+       nothing.
+
+       * gnus-start.el (gnus-get-unread-articles): Don't try to scan groups
+       from methods that are denied.
+
+       * gnus-int.el (gnus-method-denied-p): New function.
+
+       * nnimap.el (nnimap-open-connection): Use auth-sources to query and
+       store the password instead of netrc.
+       (nnimap-open-connection): Don't error out when we can't make a
+       connections.
+
+       * auth-source.el (auth-source-create): In the password prompt, say what
+       we're querying for.  Also prompt for user name if that hasn't been
+       given.
+
+       * nnimap.el (nnimap-with-process-buffer): Removed.
+
+2010-09-17  Lars Magne Ingebrigtsen  <address@hidden>
+
+       * gnus-start.el (gnus-read-active-for-groups): Don't use the "finish"
+       method when we're reading from the agent.
+
+       * nnagent.el (nnagent-retrieve-group-data-early): New dummy method.
+
+       * auth-source.el (auth-sources): Add ~/.authinfo to the default, since
+       that's probably most useful for users.
+
+       * gnus-int.el (gnus-check-server): Save result so that it doesn't say
+       "failed" all the time.
+
+       * gnus.el: Throughout all files, replace (save-excursion (set-buffer
+       ...)) with (with-current-buffer ... ).
+
+       * nntp.el (nntp-open-server): Return whether the open was successful or
+       not.
+
+       * gnus-sum.el (gnus-summary-first-subject): Have `unseen-or-unread'
+       select an unread unseen article first.
+
+       * nnimap.el (nnimap-open-connection): If the user doesn't have a
+       /etc/services, supply some sensible port defaults.
+
+       * dgnushack.el: Define netrc-credentials.
+
+2010-09-17  Julien Danjou  <address@hidden>  (tiny fix)
+
+       * mm-decode.el (mm-text-html-renderer): Document gnus-article-html.
+
+2010-09-17  Knut Anders Hatlen  <address@hidden>  (tiny change)
+
+       * nnimap.el (nnimap-get-groups): Don't bug out if the LIST command
+       doesn't have any parameters.
+
+2010-09-17  Lars Magne Ingebrigtsen  <address@hidden>
+
+       * nnimap.el (nnimap-open-connection): Upcase all capabilities, and use
+       only upcased checks.
+
+       * nnmail.el (nnmail-article-group): Fix typo in "bogus" section.
+
+       * nnimap.el (nnimap-open-shell-stream): New function.
+       (nnimap-open-connection): Use it.
+       (nnimap-transform-headers): Get the number of lines in each message.
+       (nnimap-retrieve-headers): Query for BODYSTRUCTURE so that we get the
+       number of lines.
+       (nnimap-request-list): Not all servers return UIDNEXT.  Work past this
+       problem.
+
+       * utf7.el (utf7-encode): Autoload.
+
+       * nnmail.el (nnmail-inhibit-default-split-group): New internal variable
+       to allow the mail splitting to not return a default group.  This is
+       useful for nnimap, which will leave unmatched mail in the inbox.
+
+       * nnimap.el: Rewritten.
+
+       * gnus.el (gnus-article-special-mark-lists): Add uid/active tuples, for
+       nnimap usage.
+
+       * gnus-sum.el (gnus-summary-move-article): Pass the move-to group name
+       if the move is internal, so that nnimap can do fast internal moves.
+
+       * gnus-start.el (gnus-get-unread-articles): Support early retrieval of
+       data.
+       (gnus-read-active-for-groups): Support finishing the early retrieval of
+       data.
+
+       * gnus-range.el (gnus-range-nconcat): New function.
+
+       * gnus-int.el (gnus-finish-retrieve-group-infos)
+       (gnus-retrieve-group-data-early): New functions.
+
 2010-09-17  Stefan Monnier  <address@hidden>
 
        * nnrss.el (nnrss-retrieve-headers, nnrss-request-list-newsgroups)

=== modified file 'lisp/gnus/pop3.el'
--- a/lisp/gnus/pop3.el 2010-09-18 10:02:19 +0000
+++ b/lisp/gnus/pop3.el 2010-09-18 10:21:30 +0000
@@ -279,9 +279,9 @@
   (let ((coding-system-for-read 'binary)
        (coding-system-for-write 'binary)
        process)
-    (save-excursion
-      (set-buffer (get-buffer-create (concat " trace of POP session to "
-                                            mailhost)))
+    (with-current-buffer
+        (get-buffer-create (concat " trace of POP session to "
+                                   mailhost))
       (erase-buffer)
       (setq pop3-read-point (point-min))
       (setq process
@@ -353,8 +353,7 @@
 Return the response string if optional second argument is non-nil."
   (let ((case-fold-search nil)
        match-end)
-    (save-excursion
-      (set-buffer (process-buffer process))
+    (with-current-buffer (process-buffer process)
       (goto-char pop3-read-point)
       (while (and (memq (process-status process) '(open run))
                  (not (search-forward "\r\n" nil t)))
@@ -511,8 +510,7 @@
     (if msg
        (string-to-number (nth 2 (split-string response " ")))
       (let ((start pop3-read-point) end)
-       (save-excursion
-         (set-buffer (process-buffer process))
+       (with-current-buffer (process-buffer process)
          (while (not (re-search-forward "^\\.\r\n" nil t))
            (pop3-accept-process-output process)
            (goto-char start))
@@ -530,8 +528,7 @@
   (pop3-send-command process (format "RETR %s" msg))
   (pop3-read-response process)
   (let ((start pop3-read-point) end)
-    (save-excursion
-      (set-buffer (process-buffer process))
+    (with-current-buffer (process-buffer process)
       (while (not (re-search-forward "^\\.\r\n" nil t))
        (pop3-accept-process-output process)
        (goto-char start))
@@ -547,8 +544,7 @@
       (setq end (point-marker))
       (pop3-clean-region start end)
       (pop3-munge-message-separator start end)
-      (save-excursion
-       (set-buffer crashbuf)
+      (with-current-buffer crashbuf
        (erase-buffer))
       (copy-to-buffer crashbuf start end)
       (delete-region start end)
@@ -585,8 +581,7 @@
   (pop3-send-command process "QUIT")
   (pop3-read-response process t)
   (if process
-      (save-excursion
-       (set-buffer (process-buffer process))
+      (with-current-buffer (process-buffer process)
        (goto-char (point-max))
        (delete-process process))))