(qmtp-open-connection-function): Add autoload cookie.

[elisp/flim.git] / smtpmail.el

diff --git a/smtpmail.el b/smtpmail.el
index 74638aa..6475e44 100644 (file)
--- a/smtpmail.el
+++ b/smtpmail.el
@@ -42,11 +42,11 @@
 
 ;;; Code:
 
-(require 'poe)
-(require 'pcustom)
+(require 'custom)
 (require 'smtp)
 (require 'sendmail)
 (require 'time-stamp)
+(require 'raw-io)
 
 (eval-when-compile (require 'static))
 
@@ -226,10 +226,9 @@ This is relative to `smtpmail-queue-dir'.")
          ; Send or queue
          (if (not smtpmail-queue-mail)
              (if smtpmail-recipient-address-list
-                 (if (not (smtp-via-smtp user-mail-address
-                                         smtpmail-recipient-address-list
-                                         tembuf))
-                     (error "Sending failed; SMTP protocol error"))
+                 (smtp-send-buffer user-mail-address
+                                   smtpmail-recipient-address-list
+                                   tembuf)
                (error "Sending failed; no recipients"))
            (let* ((file-data (convert-standard-filename
                               (concat
@@ -246,7 +245,7 @@ This is relative to `smtpmail-queue-dir'.")
                (insert-buffer tembuf)
                (or (file-directory-p smtpmail-queue-dir)
                    (make-directory smtpmail-queue-dir t))
-               (write-region-as-binary (point-min) (point-max) file-data)
+               (binary-write-region (point-min) (point-max) file-data)
                (set-buffer buffer-elisp)
                (erase-buffer)
                (insert (concat
@@ -282,11 +281,10 @@ This is relative to `smtpmail-queue-dir'.")
                                                   (end-of-line)
                                                   (point))))
        (load file-msg)
-       (setq tembuf (find-file-noselect-as-binary file-msg))
+       (setq tembuf (binary-find-file-noselect file-msg))
        (if smtpmail-recipient-address-list
-           (if (not (smtp-via-smtp user-mail-address
-                                   smtpmail-recipient-address-list tembuf))
-               (error "Sending failed; SMTP protocol error"))
+           (smtp-send-buffer user-mail-address
+                             smtpmail-recipient-address-list tembuf)
          (error "Sending failed; no recipients"))  
        (delete-file file-msg)
        (delete-file (concat file-msg ".el"))