From b1ae92bae4c387155db45c297b7f78e4467d8ac4 Mon Sep 17 00:00:00 2001 From: Gnus developers Date: Thu, 23 Sep 2010 23:14:02 +0000 Subject: Merge changes made in Gnus trunk. nnimap.el (nnimap-update-info): When UIDNEXT is present, use that for the active. Split -request-update-info into -request-marks and -update-info. nnimap.el (nnimap-transform-headers): Don't bug out on invalid BODYSTRUCTUREs. nnimap.el (nnimap-transform-headers): Unfold quoted {42} headers. nnir.el (nnir-run-imap): Fix up nnir to work with the new nnimap. nnimap.el (nnimap-stream): Add starttls support. gnus-int.el (gnus-request-update-info): Protect against backends not having the function. gnus-html.el (gnus-html-rescale-image): Revert change that uses window-inside-pixel-edges. gnus-start.el (gnus-fixup-nnimap-unread-after-getting-new-news): Remove. nnimap.el (nnimap-retrieve-headers): Return 'headers. gnus-sum.el (gnus-summary-local-variables): Prepare for list/range makeover. gnus-start.el: Add new variable gnus-use-backend-marks, and start reading marks again. --- lisp/gnus/nnmairix.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lisp/gnus/nnmairix.el') diff --git a/lisp/gnus/nnmairix.el b/lisp/gnus/nnmairix.el index 26d95b21eb3..f38ffd37e52 100644 --- a/lisp/gnus/nnmairix.el +++ b/lisp/gnus/nnmairix.el @@ -705,7 +705,7 @@ Other back ends might or might not work.") (autoload 'nnimap-request-update-info-internal "nnimap") -(deffoo nnmairix-request-update-info (group info &optional server) +(deffoo nnmairix-request-marks (group info &optional server) ;; propagate info from underlying IMAP folder to nnmairix group ;; This is currently experimental and must be explicitly activated ;; with nnmairix-propagate-marks-to-nnmairix-group -- cgit v1.2.3