[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r101513: Merge changes made in Gnus t
From: |
Katsumi Yamaoka |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r101513: Merge changes made in Gnus trunk. |
Date: |
Mon, 20 Sep 2010 23:08:33 +0000 |
User-agent: |
Bazaar (2.0.3) |
------------------------------------------------------------
revno: 101513
author: Lars Magne Ingebrigtsen <address@hidden>
committer: Katsumi Yamaoka <address@hidden>
branch nick: trunk
timestamp: Mon 2010-09-20 23:08:33 +0000
message:
Merge changes made in Gnus trunk.
mail-parse.el (mail-header-encode-parameter): Use -encode-parameter instead
of -encode-string.
nnimap.el (nnimap-fetch-inbox): Use "[]" as the parameter instead of "".
gnus-news.texi: Say what Emacs versions we support.
nnimap.el: Implement group deletion.
nnimap.el (nnimap-transform-headers): Return the size of the entire message
in the Bytes header, not just the size of the first part.
gnus-news.texi: The nnimap makeover.
gnus-news.texi (Supported Emacs versions): Fix typo.
nnimap.el (nnimap-request-move-article): Fix article moving from nnimap to
other servers.
nnimap.el (nnimap-request-set-mark): Don't wait for a response when we
haven't requested anything.
nnimap.el (nnimap-command): Make sure that the error message doesn't error
out.
modified:
doc/misc/gnus-news.texi
lisp/gnus/ChangeLog
lisp/gnus/mail-parse.el
lisp/gnus/nnimap.el
=== modified file 'doc/misc/gnus-news.texi'
--- a/doc/misc/gnus-news.texi 2010-09-02 00:55:51 +0000
+++ b/doc/misc/gnus-news.texi 2010-09-20 23:08:33 +0000
@@ -18,6 +18,17 @@
@itemize @bullet
address@hidden Supported Emacs versions
+The following Emacs versions are supported by No Gnus:
address@hidden @bullet
+
address@hidden Emacs 22 and up
address@hidden XEmacs 21.4
address@hidden XEmacs 21.5
address@hidden SXEmacs
+
address@hidden itemize
+
@item Installation changes
@itemize @bullet
@@ -55,6 +66,11 @@
@itemize @bullet
address@hidden New version of @code{nnimap}
+
address@hidden has been reimplemented in a mostly-compatible way.
address@hidden Mention any incompatibilities.
+
@item Gnus includes the Emacs Lisp @acronym{SASL} library.
This provides a clean @acronym{API} to @acronym{SASL} mechanisms from
=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog 2010-09-20 01:57:46 +0000
+++ b/lisp/gnus/ChangeLog 2010-09-20 23:08:33 +0000
@@ -1,3 +1,28 @@
+2010-09-20 Lars Magne Ingebrigtsen <address@hidden>
+
+ * nnimap.el (nnimap-request-group): Don't select the imap buffer before
+ opening the server.
+ (nnimap-request-delete-group): Implement group deletion.
+ (nnimap-transform-headers): Return the size of the entire message in
+ the Bytes header, not just the size of the first part.
+ (nnimap-request-move-article): When moving an article from nnimap,
+ request the article first so the accepting form has an article to
+ accept. Reported by Dan Christensen.
+ (nnimap-command): Make sure that the error message doesn't error out.
+
+2010-09-20 David Edmondson <address@hidden> (tiny change)
+
+ * nnimap.el (nnimap-request-set-mark): Don't wait for a response when
+ we haven't requested anything.
+
+2010-09-20 Lars Magne Ingebrigtsen <address@hidden>
+
+ * nnimap.el (nnimap-fetch-inbox): Use "[]" as the parameter instead of
+ "". Fix found by Andrew Cohen.
+
+ * mail-parse.el (mail-header-encode-parameter): Use -encode-parameter
+ instead of -encode-string.
+
2010-09-20 Katsumi Yamaoka <address@hidden>
* gnus-html.el (gnus-html-image-fetched): Pass arg to kill-buffer.
=== modified file 'lisp/gnus/mail-parse.el'
--- a/lisp/gnus/mail-parse.el 2010-09-20 00:36:54 +0000
+++ b/lisp/gnus/mail-parse.el 2010-09-20 23:08:33 +0000
@@ -45,7 +45,7 @@
(defalias 'mail-header-parse-content-type 'rfc2231-parse-qp-string)
(defalias 'mail-header-parse-content-disposition 'rfc2231-parse-qp-string)
(defalias 'mail-content-type-get 'rfc2231-get-value)
-(defalias 'mail-header-encode-parameter 'rfc2045-encode-string)
+(defalias 'mail-header-encode-parameter 'rfc2047-encode-parameter)
(defalias 'mail-header-remove-comments 'ietf-drums-remove-comments)
(defalias 'mail-header-remove-whitespace 'ietf-drums-remove-whitespace)
=== modified file 'lisp/gnus/nnimap.el'
--- a/lisp/gnus/nnimap.el 2010-09-20 00:36:54 +0000
+++ b/lisp/gnus/nnimap.el 2010-09-20 23:08:33 +0000
@@ -137,7 +137,7 @@
(defun nnimap-transform-headers ()
(goto-char (point-min))
- (let (article bytes lines)
+ (let (article bytes lines size)
(block nil
(while (not (eobp))
(while (not (looking-at "^\\* [0-9]+ FETCH.*UID \\([0-9]+\\)"))
@@ -148,6 +148,12 @@
bytes (nnimap-get-length)
lines nil)
(beginning-of-line)
+ (setq size
+ (and (re-search-forward "RFC822.SIZE \\([0-9]+\\)"
+ (line-end-position)
+ t)
+ (match-string 1)))
+ (beginning-of-line)
(when (search-forward "BODYSTRUCTURE" (line-end-position) t)
(let ((structure (ignore-errors (read (current-buffer)))))
(while (and (consp structure)
@@ -157,7 +163,8 @@
(delete-region (line-beginning-position) (line-end-position))
(insert (format "211 %s Article retrieved." article))
(forward-line 1)
- (insert (format "Chars: %d\n" bytes))
+ (when size
+ (insert (format "Chars: %s\n" size)))
(when lines
(insert (format "Lines: %s\n" lines)))
(re-search-forward "^\r$")
@@ -384,9 +391,9 @@
(nreverse parts)))
(deffoo nnimap-request-group (group &optional server dont-check info)
- (with-current-buffer nntp-server-buffer
- (let ((result (nnimap-possibly-change-group group server))
- articles active marks high low)
+ (let ((result (nnimap-possibly-change-group group server))
+ articles active marks high low)
+ (with-current-buffer nntp-server-buffer
(when result
(if (and dont-check
(setq active (nth 2 (assoc group nnimap-current-infos))))
@@ -424,6 +431,11 @@
low high group))))
t)))
+(deffoo nnimap-request-delete-group (group &optional force server)
+ (when (nnimap-possibly-change-group nil server)
+ (with-current-buffer (nnimap-buffer)
+ (car (nnimap-command "DELETE %S" (utf7-encode group))))))
+
(defun nnimap-get-flags (spec)
(let ((articles nil)
elems)
@@ -460,10 +472,11 @@
(nnimap-find-article-by-message-id
internal-move-group message-id))))
(with-temp-buffer
- (let ((result (eval accept-form)))
- (when result
- (nnimap-delete-article article)
- result)))))))
+ (when (nnimap-request-article article group server (current-buffer))
+ (let ((result (eval accept-form)))
+ (when result
+ (nnimap-delete-article article)
+ result))))))))
(deffoo nnimap-request-expire-articles (articles group &optional server force)
(cond
@@ -530,7 +543,8 @@
(mapconcat #'identity flags " ")))))))
;; Wait for the last command to complete to avoid later
;; syncronisation problems with the stream.
- (nnimap-wait-for-response sequence)))))
+ (when sequence
+ (nnimap-wait-for-response sequence))))))
(deffoo nnimap-request-accept-article (group &optional server last)
(when (nnimap-possibly-change-group nil server)
@@ -863,7 +877,9 @@
(if (equal (caar response) "OK")
(cons t response)
(nnheader-report 'nnimap "%s"
- (mapconcat #'identity (car response) " "))
+ (mapconcat (lambda (a)
+ (format "%s" a))
+ (car response) " "))
nil)))
(defun nnimap-get-response (sequence)
@@ -972,7 +988,7 @@
"BODY.PEEK[HEADER] BODY.PEEK"
"RFC822.PEEK"))
(if nnimap-split-download-body-default
- ""
+ "[]"
"[1]")))
t))
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r101513: Merge changes made in Gnus trunk.,
Katsumi Yamaoka <=