mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-17 03:10:58 -08:00
Code Issues Projects Releases Wiki Activity

* lisp/mail/smtpmail.el (smtpmail-send-data-1): No string-as-multibyte

Browse source 
This is not needed any more since unibyte strings will be sent as-is
anyway by process-send-string.
(smtpmail-via-smtp): Avoid set-buffer-process-coding-system.
This commit is contained in:
Stefan Monnier 2018-01-15 13:15:12 -05:00
parent fe258a4b88
commit 8e05cb61a2
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
lisp/mail/smtpmail.el
View file

@ -683,7 +683,9 @@ Returns an error if the server cannot be contacted."
(setq buffer-undo-list t) (setq buffer-undo-list t)
(erase-buffer)) (erase-buffer))
;; open the connection to the server ;; Open the connection to the server.
;; FIXME: Should we use raw-text-dos coding system to handle the r\n
;; for us?
(let ((coding-system-for-read 'binary) (let ((coding-system-for-read 'binary)
(coding-system-for-write 'binary)) (coding-system-for-write 'binary))
(setq result (setq result
@ -720,9 +722,8 @@ Returns an error if the server cannot be contacted."
(throw 'done (format "Connection not allowed: %s" greeting)))) (throw 'done (format "Connection not allowed: %s" greeting))))
(with-current-buffer process-buffer (with-current-buffer process-buffer
(set-buffer-process-coding-system 'raw-text-unix 'raw-text-unix) (set-process-coding-system process 'raw-text-unix 'raw-text-unix)
(make-local-variable 'smtpmail-read-point) (setq-local smtpmail-read-point (point-min))
(setq smtpmail-read-point (point-min))
(let* ((capabilities (plist-get (cdr result) :capabilities)) (let* ((capabilities (plist-get (cdr result) :capabilities))
(code (smtpmail-response-code capabilities))) (code (smtpmail-response-code capabilities)))
@ -945,8 +946,7 @@ Returns an error if the server cannot be contacted."
(if (and (multibyte-string-p data) (if (and (multibyte-string-p data)
smtpmail-code-conv-from) smtpmail-code-conv-from)
(setq data (string-as-multibyte ;FIXME: ??? (setq data (encode-coding-string data smtpmail-code-conv-from)))
(encode-coding-string data smtpmail-code-conv-from))))
(if smtpmail-debug-info (if smtpmail-debug-info
(insert data "\r\n")) (insert data "\r\n"))