- Require `raw-io'.

- Delete definition of obsolete variable aliases for XEmacs.
(smtpmail-send-queued-mail): Use `binary-find-file-noselect' instead
of `find-file-noselect-as-binary'.

diff --git a/mail/smtpmail.el b/mail/smtpmail.el
index 094dc4f..4a7ba79 100644 (file)
--- a/mail/smtpmail.el
+++ b/mail/smtpmail.el
@@ -46,17 +46,18 @@
 (require 'smtp)
 (require 'sendmail)
 (require 'time-stamp)
+(require 'raw-io)
 
 (eval-when-compile (require 'static))
 
-(static-when (featurep 'xemacs)
-  (define-obsolete-variable-alias 'smtpmail-default-smtp-server
-    'smtp-default-server)
-  (define-obsolete-variable-alias 'smtpmail-smtp-server 'smtp-server)
-  (define-obsolete-variable-alias 'smtpmail-smtp-service 'smtp-service)
-  (define-obsolete-variable-alias 'smtpmail-local-domain 'smtp-local-domain)
-  (define-obsolete-variable-alias 'smtpmail-debug-info 'smtp-debug-info)
-  )
+;; (static-when (featurep 'xemacs)
+;;   (define-obsolete-variable-alias 'smtpmail-default-smtp-server
+;;     'smtp-default-server)
+;;   (define-obsolete-variable-alias 'smtpmail-smtp-server 'smtp-server)
+;;   (define-obsolete-variable-alias 'smtpmail-smtp-service 'smtp-service)
+;;   (define-obsolete-variable-alias 'smtpmail-local-domain 'smtp-local-domain)
+;;   (define-obsolete-variable-alias 'smtpmail-debug-info 'smtp-debug-info)
+;;   )
 
 ;;;
 
@@ -280,7 +281,7 @@ 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
            (smtp-send-buffer user-mail-address
                              smtpmail-recipient-address-list tembuf)