Commit f362b760 authored by Miles Bader's avatar Miles Bader
Browse files

Merge from gnus--rel--5.10

Patches applied:

 * gnus--rel--5.10  (patch 105-106)

   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--devo--0--patch-313
parent 993d4ab6
2006-06-16 Katsumi Yamaoka <yamaoka@jpl.org>
* message.el (message-syntax-checks): Doc fix.
(message-send-mail): Add check for continuation headers.
(message-check-news-header-syntax): Fix regexp used to check for
continuation headers.
2006-06-14 Katsumi Yamaoka <yamaoka@jpl.org>
* gnus-art.el (gnus-display-mime): Make sure body ends with newline.
2006-06-06 Katsumi Yamaoka <yamaoka@jpl.org> 2006-06-06 Katsumi Yamaoka <yamaoka@jpl.org>
* mm-util.el (mm-mime-mule-charset-alist): Use unicode-precedence-list * mm-util.el (mm-mime-mule-charset-alist): Use unicode-precedence-list
......
...@@ -4927,7 +4927,11 @@ N is the numerical prefix." ...@@ -4927,7 +4927,11 @@ N is the numerical prefix."
(article-goto-body) (article-goto-body)
(narrow-to-region (point-min) (point)) (narrow-to-region (point-min) (point))
(gnus-article-save-original-date (gnus-article-save-original-date
(gnus-treat-article 'head))))))))) (gnus-treat-article 'head)))))))
;; Cope with broken MIME messages.
(goto-char (point-max))
(unless (bolp)
(insert "\n"))))
(defcustom gnus-mime-display-multipart-as-mixed nil (defcustom gnus-mime-display-multipart-as-mixed nil
"Display \"multipart\" parts as \"multipart/mixed\". "Display \"multipart\" parts as \"multipart/mixed\".
......
...@@ -190,14 +190,13 @@ To disable checking of long signatures, for instance, add ...@@ -190,14 +190,13 @@ To disable checking of long signatures, for instance, add
Don't touch this variable unless you really know what you're doing. Don't touch this variable unless you really know what you're doing.
Checks include `subject-cmsg', `multiple-headers', `sendsys', Checks include `approved', `continuation-headers', `control-chars',
`message-id', `from', `long-lines', `control-chars', `size', `empty', `existing-newsgroups', `from', `illegible-text',
`new-text', `quoting-style', `redirected-followup', `signature', `invisible-text', `long-header-lines', `long-lines', `message-id',
`approved', `sender', `empty', `empty-headers', `message-id', `from', `multiple-headers', `new-text', `newsgroups', `quoting-style',
`subject', `shorten-followup-to', `existing-newsgroups', `repeated-newsgroups', `reply-to', `sendsys', `shoot',
`buffer-file-name', `unchanged', `newsgroups', `reply-to', `shorten-followup-to', `signature', `size', `subject', `subject-cmsg'
`continuation-headers', `long-header-lines', `invisible-text' and and `valid-newsgroups'."
`illegible-text'."
:group 'message-news :group 'message-news
:type '(repeat sexp)) ; Fixme: improve this :type '(repeat sexp)) ; Fixme: improve this
...@@ -3769,6 +3768,16 @@ It should typically alter the sending method in some way or other." ...@@ -3769,6 +3768,16 @@ It should typically alter the sending method in some way or other."
(let ((message-deletable-headers (let ((message-deletable-headers
(if news nil message-deletable-headers))) (if news nil message-deletable-headers)))
(message-generate-headers headers)) (message-generate-headers headers))
;; Check continuation headers.
(message-check 'continuation-headers
(goto-char (point-min))
(while (re-search-forward "^[^ \t\n][^ \t\n:]*[ \t\n]" nil t)
(goto-char (match-beginning 0))
(if (y-or-n-p "Fix continuation lines? ")
(insert " ")
(forward-line 1)
(unless (y-or-n-p "Send anyway? ")
(error "Failed to send the message")))))
;; Let the user do all of the above. ;; Let the user do all of the above.
(run-hooks 'message-header-hook)) (run-hooks 'message-header-hook))
(unwind-protect (unwind-protect
...@@ -4326,11 +4335,11 @@ Otherwise, generate and save a value for `canlock-password' first." ...@@ -4326,11 +4335,11 @@ Otherwise, generate and save a value for `canlock-password' first."
(message-check 'continuation-headers (message-check 'continuation-headers
(goto-char (point-min)) (goto-char (point-min))
(let ((do-posting t)) (let ((do-posting t))
(while (re-search-forward "^[^ \t\n][^:\n]*$" nil t) (while (re-search-forward "^[^ \t\n][^ \t\n:]*[ \t\n]" nil t)
(goto-char (match-beginning 0))
(if (y-or-n-p "Fix continuation lines? ") (if (y-or-n-p "Fix continuation lines? ")
(progn (insert " ")
(goto-char (match-beginning 0)) (forward-line 1)
(insert " "))
(unless (y-or-n-p "Send anyway? ") (unless (y-or-n-p "Send anyway? ")
(setq do-posting nil)))) (setq do-posting nil))))
do-posting)) do-posting))
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment