X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=qmtp.el;h=b1f1072a4b38a106738492c1bc1145eed9fc8183;hb=6260b782ec94886678bc08ecf41d7fa91fa6c9c5;hp=cf5c2948f44cc2c85f3237fea03fb0be55efba80;hpb=57a3177465e8d977a8b2423f4343eefd3adf3d00;p=elisp%2Fflim.git

diff --git a/qmtp.el b/qmtp.el
index cf5c294..b1f1072 100644
--- a/qmtp.el
+++ b/qmtp.el
@@ -19,8 +19,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with this program; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 
 ;;; Commentary:
@@ -34,6 +34,7 @@
 ;;; Code:
 
 (require 'custom)
+(require 'mel) ; binary-funcall
 
 (defgroup qmtp nil
   "QMTP protocol for sending mail."
@@ -60,8 +61,8 @@ called from `qmtp-via-qmtp' with arguments SENDER and RECIPIENTS.")
   :type 'integer
   :group 'qmtp)
 
-(autoload 'binary-open-network-stream "raw-io")
-(defvar qmtp-open-connection-function (function binary-open-network-stream))
+;;;###autoload
+(defvar qmtp-open-connection-function (function open-network-stream))
 
 (defvar qmtp-error-response-alist
   '((?Z "Temporary failure")
@@ -127,8 +128,9 @@ called from `qmtp-via-qmtp' with arguments SENDER and RECIPIENTS.")
       (unwind-protect
 	  (progn
 	    (setq process
-		  (funcall qmtp-open-connection-function
-			   "QMTP" (current-buffer) qmtp-server qmtp-service))
+		  (binary-funcall qmtp-open-connection-function
+				  "QMTP" (current-buffer)
+				  qmtp-server qmtp-service))
 	    (qmtp-send-package process sender recipients buffer))
 	(when (and process
 		   (memq (process-status process) '(open run)))