Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
caf9510c
Commit
caf9510c
authored
Apr 09, 2009
by
Richard M. Stallman
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
* mail/sendmail.el (sendmail-send-it): Replace any
pre-existing Content-type header if we insert one.
parent
49096407
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
22 additions
and
6 deletions
+22
-6
lisp/ChangeLog
lisp/ChangeLog
+5
-0
lisp/mail/sendmail.el
lisp/mail/sendmail.el
+17
-6
No files found.
lisp/ChangeLog
View file @
caf9510c
2009-04-09 Richard M Stallman <rms@gnu.org>
* mail/sendmail.el (sendmail-send-it): Replace any
pre-existing Content-type header if we insert one.
2009-04-09 Michael Albinus <michael.albinus@gmx.de>
* net/tramp.el (tramp-file-name-handler-alist): Add
...
...
lisp/mail/sendmail.el
View file @
caf9510c
...
...
@@ -1113,7 +1113,10 @@ external program defined by `sendmail-program'."
(
if
(
not
(
re-search-forward
"^From:"
delimline
t
))
(
mail-insert-from-field
))
;; Possibly add a MIME header for the current coding system
(
let
(
charset
)
(
let
(
charset
where-content-type
)
(
goto-char
(
point-min
))
(
setq
where-content-type
(
re-search-forward
"^Content-type:"
delimline
t
))
(
goto-char
(
point-min
))
(
and
(
eq
mail-send-nonascii
'mime
)
(
not
(
re-search-forward
"^MIME-version:"
delimline
t
))
...
...
@@ -1122,11 +1125,19 @@ external program defined by `sendmail-program'."
selected-coding
(
setq
charset
(
coding-system-get
selected-coding
:mime-charset
))
(
goto-char
delimline
)
(
insert
"MIME-version: 1.0\n"
"Content-type: text/plain; charset="
(
symbol-name
charset
)
"\nContent-Transfer-Encoding: 8bit\n"
)))
(
progn
(
goto-char
delimline
)
(
insert
"MIME-version: 1.0\n"
"Content-type: text/plain; charset="
(
symbol-name
charset
)
"\nContent-Transfer-Encoding: 8bit\n"
)
;; The character set we will actually use
;; should override any specified in the message itself.
(
when
where-content-type
(
goto-char
where-content-type
)
(
beginning-of-line
)
(
delete-region
(
point
)
(
progn
(
forward-line
1
)
(
point
)))))))
;; Insert an extra newline if we need it to work around
;; Sun's bug that swallows newlines.
(
goto-char
(
1+
delimline
))
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment