From 88ed5ce8a653a870fd4f723ee550ffbb0f90626b Mon Sep 17 00:00:00 2001 From: Katsumi Yamaoka Date: Sat, 18 Sep 2010 10:21:30 +0000 Subject: [PATCH] Fix previous merge from Gnus trunk. --- lisp/gnus/ChangeLog | 100 ++++++++++++++++++++++++++++++++++++++++++++ lisp/gnus/pop3.el | 21 ++++------ 2 files changed, 108 insertions(+), 13 deletions(-) diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index 1e6b9f23295..ee623eba37f 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -1,3 +1,103 @@ +2010-09-18 Lars Magne Ingebrigtsen + + * 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 + + * 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 (tiny fix) + + * mm-decode.el (mm-text-html-renderer): Document gnus-article-html. + +2010-09-17 Knut Anders Hatlen (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 + + * 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 * nnrss.el (nnrss-retrieve-headers, nnrss-request-list-newsgroups) diff --git a/lisp/gnus/pop3.el b/lisp/gnus/pop3.el index 63ed8004a9f..950cae25c4e 100644 --- a/lisp/gnus/pop3.el +++ b/lisp/gnus/pop3.el @@ -279,9 +279,9 @@ Returns the process associated with the connection." (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 @@ Returns the process associated with the connection." 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 @@ Otherwise, return the size of the message-id MSG" (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 @@ Otherwise, return the size of the message-id MSG" (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 @@ Otherwise, return the size of the message-id MSG" (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 @@ and close the connection." (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)))) -- 2.39.2