procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge chages made in Gnus trunk.

Browse source 
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.
This commit is contained in:
Gnus developers 2011-01-23 00:34:08 +00:00 • committed by Katsumi Yamaoka
parent 572bf6f254
commit 9e928ac989
9 changed files with 63 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
lisp/gnus/ChangeLog
View file

@ -1,3 +1,34 @@
2011-01-22 Lars Ingebrigtsen <larsi@gnus.org>
* gnus-sum.el (gnus-summary-move-article): Protect against backends
(i.e., nnimap) returning nil as the article number.
2011-01-22 Kazuhiro Ito <kzhr@d1.dion.ne.jp>
* flow-fill.el (fill-flowed): Make `delete-space' option correspond to
"DelSp" parameter in RFC3676.
2011-01-22 Lars Ingebrigtsen <larsi@gnus.org>
* 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 <julien@danjou.info>
* mailcap.el (mailcap-mime-extensions): Rename text/org to text/x-org.
2011-01-22 Lars Ingebrigtsen <larsi@gnus.org>
* mm-decode.el (mm-preferred-alternative-precedence): Don't bug out on

4
lisp/gnus/flow-fill.el
View file

@ -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

3
lisp/gnus/gnus-agent.el
View file

@ -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.

3
lisp/gnus/gnus-draft.el
View file

@ -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 ()

7
lisp/gnus/gnus-group.el
View file

@ -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

2
lisp/gnus/gnus-start.el
View file

@ -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)))))

9
lisp/gnus/gnus-sum.el
View file

@ -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)))

2
lisp/gnus/mailcap.el
View file

@ -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'.")

13
lisp/gnus/message.el
View file

@ -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)