diff options
| author | Miles Bader <miles@gnu.org> | 2006-06-17 20:57:37 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2006-06-17 20:57:37 +0000 |
| commit | 10c1758c0b2d29b3e1fb8e3ffe5c5dc262f25217 (patch) | |
| tree | 78d2db4ab91026e7d5373086d022a2bce083200b /lisp/mail/sendmail.el | |
| parent | 2090e2a3897bd0e36fd0e8ba13d861668a0a887f (diff) | |
| parent | f362b76002bfd0f43af76a7772a808c042302f07 (diff) | |
| download | emacs-10c1758c0b2d29b3e1fb8e3ffe5c5dc262f25217.tar.gz emacs-10c1758c0b2d29b3e1fb8e3ffe5c5dc262f25217.tar.bz2 emacs-10c1758c0b2d29b3e1fb8e3ffe5c5dc262f25217.zip | |
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 300-313)
- Update from CVS
- Update from CVS: lispref/display.texi (Forcing Redisplay): Fix typo.
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 105-106)
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-74
Diffstat (limited to 'lisp/mail/sendmail.el')
| -rw-r--r-- | lisp/mail/sendmail.el | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/lisp/mail/sendmail.el b/lisp/mail/sendmail.el index 3fa7eda968c..0760aa648ec 100644 --- a/lisp/mail/sendmail.el +++ b/lisp/mail/sendmail.el @@ -863,11 +863,14 @@ the user from the mailer." (error "Message contains non-ASCII characters")))) ;; Complain about any invalid line. (goto-char (point-min)) - (while (< (point) (mail-header-end)) - (unless (looking-at "[ \t]\\|.*:\\|$") - (push-mark opoint) - (error "Invalid header line (maybe a continuation line lacks initial whitespace)")) - (forward-line 1)) + (re-search-forward (regexp-quote mail-header-separator) (point-max) t) + (let ((header-end (or (match-beginning 0) (point-max)))) + (goto-char (point-min)) + (while (< (point) header-end) + (unless (looking-at "[ \t]\\|.*:\\|$") + (push-mark opoint) + (error "Invalid header line (maybe a continuation line lacks initial whitespace)")) + (forward-line 1))) (goto-char opoint) (run-hooks 'mail-send-hook) (message "Sending...") |