From: Gnus developers Date: Sun, 23 Jan 2011 00:34:08 +0000 (+0000) Subject: Merge chages made in Gnus trunk. X-Git-Tag: emacs-pretest-24.0.90~104^2~618^2~1322^2~155 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=9e928ac989c824c376b1ab576a6da69cd86b12c6;p=emacs.git Merge chages made in Gnus trunk. mailcap.el (mailcap-mime-extensions): Rename text/org to text/x-org. gnus-draft.el (gnus-group-send-queue): Update the queue group in the group buffer after sending the queue. gnus-draft.el (gnus-group-send-queue): Really refresh the queue group after sending. gnus-agent.el (gnus-agent-send-mail): Ditto. gnus-group.el (gnus-group-refresh-group): New convenience function. message.el (message-bogus-addresses): Remove commented-out value. message.el (message-check-recipients): Display the encoded version of the bogus address if they differ. flow-fill.el (fill-flowed): Make `delete-space' option correspond to "DelSp" parameter in RFC3676. gnus-sum.el (gnus-summary-move-article): Protect against backends (i.e., nnimap) returning nil as the article number. --- diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index d55140ada42..ce1e20e95cb 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -1,3 +1,34 @@ +2011-01-22 Lars Ingebrigtsen + + * gnus-sum.el (gnus-summary-move-article): Protect against backends + (i.e., nnimap) returning nil as the article number. + +2011-01-22 Kazuhiro Ito + + * flow-fill.el (fill-flowed): Make `delete-space' option correspond to + "DelSp" parameter in RFC3676. + +2011-01-22 Lars Ingebrigtsen + + * message.el (message-check-recipients): Display the encoded version of + the bogus address if they differ. + + * gnus-draft.el (gnus-group-send-queue): Really refresh the queue group + after sending. + + * gnus-agent.el (gnus-agent-send-mail): Ditto. + + * gnus-group.el (gnus-group-refresh-group): New convenience function. + + * gnus-draft.el (gnus-group-send-queue): Update the queue group in the + group buffer after sending the queue. + + * gnus-agent.el (gnus-agent-send-mail): Ditto. + +2011-01-22 Julien Danjou + + * mailcap.el (mailcap-mime-extensions): Rename text/org to text/x-org. + 2011-01-22 Lars Ingebrigtsen * mm-decode.el (mm-preferred-alternative-precedence): Don't bug out on diff --git a/lisp/gnus/flow-fill.el b/lisp/gnus/flow-fill.el index 66422d2f7d4..76339c0ad2e 100644 --- a/lisp/gnus/flow-fill.el +++ b/lisp/gnus/flow-fill.el @@ -124,8 +124,6 @@ RFC 2646 suggests 66 characters for readability." (forward-line 1)) (goto-char (point-min)) (while (re-search-forward " $" nil t) - (when delete-space - (delete-char -1)) (when (save-excursion (beginning-of-line) (looking-at "^\\(>*\\)\\( ?\\)")) @@ -153,6 +151,8 @@ RFC 2646 suggests 66 characters for readability." (replace-match (if (string= (match-string 2) " ") "" "\\2"))) (backward-delete-char -1) + (when delete-space + (delete-char -1)) (end-of-line)) (unless sig (condition-case nil diff --git a/lisp/gnus/gnus-agent.el b/lisp/gnus/gnus-agent.el index 2c215e85862..13fa94ee064 100644 --- a/lisp/gnus/gnus-agent.el +++ b/lisp/gnus/gnus-agent.el @@ -731,7 +731,8 @@ Optional arg GROUP-NAME allows to specify another group." (concat "^" (regexp-quote mail-header-separator) "\n")) (replace-match "\n") (gnus-agent-insert-meta-information 'mail) - (gnus-request-accept-article "nndraft:queue" nil t t))) + (gnus-request-accept-article "nndraft:queue" nil t t) + (gnus-group-refresh-group "nndraft:queue"))) (defun gnus-agent-insert-meta-information (type &optional method) "Insert meta-information into the message that says how it's to be posted. diff --git a/lisp/gnus/gnus-draft.el b/lisp/gnus/gnus-draft.el index c13018f1d47..e13bb880cb6 100644 --- a/lisp/gnus/gnus-draft.el +++ b/lisp/gnus/gnus-draft.el @@ -221,7 +221,8 @@ Obeys the standard process/prefix convention." (let ((message-sending-message (format "Sending message %d of %d..." (- total (length articles)) total))) - (gnus-draft-send article)))))))) + (gnus-draft-send article)))))) + (gnus-group-refresh-group "nndraft:queue"))) ;;;###autoload (defun gnus-draft-reminder () diff --git a/lisp/gnus/gnus-group.el b/lisp/gnus/gnus-group.el index a21053c60b5..5ce1ed87e57 100644 --- a/lisp/gnus/gnus-group.el +++ b/lisp/gnus/gnus-group.el @@ -1678,6 +1678,13 @@ and ends at END." " ")) " ")) + +(defun gnus-group-refresh-group (group) + (gnus-activate-group group) + (gnus-get-unread-articles-in-group (gnus-get-info group) + (gnus-active group)) + (gnus-group-update-group group t)) + (defun gnus-group-update-group (group &optional visible-only) "Update all lines where GROUP appear. If VISIBLE-ONLY is non-nil, the group won't be displayed if it isn't diff --git a/lisp/gnus/gnus-start.el b/lisp/gnus/gnus-start.el index 38b8174e445..12c4b4a5a14 100644 --- a/lisp/gnus/gnus-start.el +++ b/lisp/gnus/gnus-start.el @@ -1509,7 +1509,7 @@ If SCAN, request a scan of that group as well." (gnus-info-group info))))) (gnus-activate-group (gnus-info-group info) nil t)) - ;; Allow backends to update marks, + ;; Allow backends to update marks, (when gnus-use-backend-marks (let ((method (inline (gnus-find-method-for-group (gnus-info-group info))))) diff --git a/lisp/gnus/gnus-sum.el b/lisp/gnus/gnus-sum.el index 2d9986cac76..101396c8813 100644 --- a/lisp/gnus/gnus-sum.el +++ b/lisp/gnus/gnus-sum.el @@ -9836,7 +9836,8 @@ ACTION can be either `move' (the default), `crosspost' or `copy'." (unless (member to-group to-groups) (push to-group to-groups)) - (unless (memq article gnus-newsgroup-unreads) + (when (and (not (memq article gnus-newsgroup-unreads)) + (cdr art-group)) (push 'read to-marks) (gnus-info-set-read info (gnus-add-to-range (gnus-info-read info) @@ -9853,14 +9854,16 @@ ACTION can be either `move' (the default), `crosspost' or `copy'." ;; Enter the article into the cache in the new group, ;; if that is required. - (when gnus-use-cache + (when (and to-article + gnus-use-cache) (gnus-cache-possibly-enter-article to-group to-article (memq article gnus-newsgroup-marked) (memq article gnus-newsgroup-dormant) (memq article gnus-newsgroup-unreads))) - (when gnus-preserve-marks + (when (and gnus-preserve-marks + to-article) ;; Copy any marks over to the new group. (when (and (equal to-group gnus-newsgroup-name) (not (memq article gnus-newsgroup-unreads))) diff --git a/lisp/gnus/mailcap.el b/lisp/gnus/mailcap.el index e50e61bb8fb..aa2cab66a05 100644 --- a/lisp/gnus/mailcap.el +++ b/lisp/gnus/mailcap.el @@ -911,7 +911,7 @@ If NO-DECODE is non-nil, don't decode STRING." (".ai" . "application/postscript") (".jpe" . "image/jpeg") (".jpeg" . "image/jpeg") - (".org" . "text/org")) + (".org" . "text/x-org")) "An alist of file extensions and corresponding MIME content-types. This exists for you to customize the information in Lisp. It is merged with values from mailcap files by `mailcap-parse-mimetypes'.") diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el index 81093136d5a..50f509a14b0 100644 --- a/lisp/gnus/message.el +++ b/lisp/gnus/message.el @@ -4128,7 +4128,6 @@ not have PROP." (nreverse regions))) (defcustom message-bogus-addresses - ;; '("noreply" "nospam" "invalid") '("noreply" "nospam" "invalid" "@@" "[^[:ascii:]].*@" "[ \t]") "List of regexps of potentially bogus mail addresses. See `message-check-recipients' how to setup checking. @@ -4294,7 +4293,17 @@ This function could be useful in `message-setup-hook'." (and bog (not (y-or-n-p (format - "Address `%s' might be bogus. Continue? " bog))) + "Address `%s'%s might be bogus. Continue? " + bog + ;; If the encoded version of the email address + ;; is different from the unencoded version, + ;; then we likely have invisible characters or + ;; the like. Display the encoded version, + ;; too. + (let ((encoded (rfc2047-encode-string bog))) + (if (string= encoded bog) + "" + (format " (%s)" encoded)))))) (error "Bogus address")))))))) (custom-add-option 'message-setup-hook 'message-check-recipients)