/[emacs]/emacs/lisp/mail/smtpmail.el
ViewVC logotype

Diff of /emacs/lisp/mail/smtpmail.el

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.73 by lektu, Mon May 16 11:16:34 2005 UTC revision 1.74 by rms, Sun May 22 13:49:09 2005 UTC
# Line 396  This is relative to `smtpmail-queue-dir' Line 396  This is relative to `smtpmail-queue-dir'
396      ;;; mail, send it, etc...      ;;; mail, send it, etc...
397      (let ((file-msg ""))      (let ((file-msg ""))
398        (insert-file-contents smtpmail-queue-index)        (insert-file-contents smtpmail-queue-index)
399        (beginning-of-buffer)        (goto-char (point-min))
400        (while (not (eobp))        (while (not (eobp))
401          (setq file-msg (buffer-substring (point) (line-end-position)))          (setq file-msg (buffer-substring (point) (line-end-position)))
402          (load file-msg)          (load file-msg)
# Line 465  This is relative to `smtpmail-queue-dir' Line 465  This is relative to `smtpmail-queue-dir'
465          (push el2 result)))          (push el2 result)))
466      (nreverse result)))      (nreverse result)))
467    
468    (defvar starttls-extra-args)
469    (defvar starttls-extra-arguments)
470    
471  (defun smtpmail-open-stream (process-buffer host port)  (defun smtpmail-open-stream (process-buffer host port)
472    (let ((cred (smtpmail-find-credentials    (let ((cred (smtpmail-find-credentials
473                 smtpmail-starttls-credentials host port)))                 smtpmail-starttls-credentials host port)))
474      (if (null (and cred (condition-case ()      (if (null (and cred (condition-case ()
475                              (progn                              (with-no-warnings
476                                (require 'starttls)                                (require 'starttls)
477                                (call-process (if starttls-use-gnutls                                (call-process (if starttls-use-gnutls
478                                                  starttls-gnutls-program                                                  starttls-gnutls-program

Legend:
Removed from v.1.73  
changed lines
  Added in v.1.74

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26