*** dist/Makefile.dist Fri Feb 14 16:19:38 2003 --- Makefile Tue Mar 4 22:22:26 2003 *************** *** 113,115 **** ! install: all install-info install-vm install-pixmaps install-utils --- 113,115 ---- ! install: all install-info install-vm install-el install-pixmaps install-utils *** dist/vm-crypto.el.dist Fri Feb 14 16:19:38 2003 --- vm-crypto.el Tue Mar 4 23:59:36 2003 *************** *** 174 **** --- 174,198 ---- (t nil))) + + (defun vm-stunnel-configuration-args (host port) + (if vm-stunnel-wants-configuration-file + (nconc (vm-stunnel-random-data-args) + (list "-W" "-c" "-r" + (format "%s:%s" host port))) + (let ((work-buffer nil) + (workfile (vm-stunnel-configuration-file))) + (unwind-protect + (save-excursion + (setq work-buffer (vm-make-work-buffer)) + (set-buffer work-buffer) + (insert "client = yes\n") + (insert "RNDfile = " vm-stunnel-random-data-file "\n") + (insert "RNDoverwrite = no\n") + (insert "connect = " (format "%s:%s" host port) "\n") + (write-region (point-min) (point-max) workfile nil 0)) + (and work-buffer (kill-buffer work-buffer))) + (list workfile) ))) + + (defun vm-stunnel-configuration-file () + (setq vm-stunnel-configuration-file (vm-make-tempfile)) + (vm-register-global-garbage-files (list vm-stunnel-configuration-file)) + vm-stunnel-configuration-file) *** dist/vm-imap.el.dist Mon Mar 3 23:53:30 2003 --- vm-imap.el Wed Mar 5 00:01:00 2003 *************** *** 53,56 **** (source-nopwd (vm-imapdrop-sans-password source)) ! (use-body-peek (vm-imap-capability 'IMAP4REV1)) ! auto-expunge x select source-list uid can-delete read-write uid-validity --- 53,55 ---- (source-nopwd (vm-imapdrop-sans-password source)) ! use-body-peek auto-expunge x select source-list uid can-delete read-write uid-validity *************** *** 83,85 **** read-write (nth 2 select) ! can-delete (nth 3 select)) ;; sweep through the retrieval list, removing entries --- 82,85 ---- read-write (nth 2 select) ! can-delete (nth 3 select) ! use-body-peek (vm-imap-capability 'IMAP4REV1)) ;; sweep through the retrieval list, removing entries *************** *** 491,495 **** vm-stunnel-program ! (nconc (vm-stunnel-random-data-args) ! (list "-W" "-c" "-r" ! (format "%s:%s" host port)) vm-stunnel-program-switches)))) --- 491,494 ---- vm-stunnel-program ! (nconc (vm-stunnel-configuration-args host ! port) vm-stunnel-program-switches)))) *** dist/vm-menu.el.dist Mon Mar 3 23:53:30 2003 --- vm-menu.el Tue Mar 4 07:14:56 2003 *************** *** 446,451 **** (vm-mouse-send-url-at-position (point) ! 'vm-mouse-send-url-to-konqueror)] ["X Clipboard" (vm-mouse-send-url-at-position (point) ! 'vm-mouse-send-url-to-clipboard)]))) --- 446,453 ---- (vm-mouse-send-url-at-position (point) ! 'vm-mouse-send-url-to-konqueror) ! t] ["X Clipboard" (vm-mouse-send-url-at-position (point) ! 'vm-mouse-send-url-to-clipboard) ! t]))) *** dist/vm-mime.el.dist Mon Mar 3 23:53:30 2003 --- vm-mime.el Tue Mar 4 07:46:33 2003 *************** *** 214,216 **** (cond ((or vm-xemacs-mule-p vm-fsfemacs-mule-p) ! (if (or (and vm-xemacs-p (memq (device-type) '(x mswindows))) vm-fsfemacs-p --- 214,216 ---- (cond ((or vm-xemacs-mule-p vm-fsfemacs-mule-p) ! (if (or (and vm-xemacs-p (memq (device-type) '(x gtk mswindows))) vm-fsfemacs-p *************** *** 1336,1338 **** (not native-sound-only-on-console) ! (eq (device-type) 'x))))) ((vm-mime-types-match "multipart" type) t) --- 1336,1338 ---- (not native-sound-only-on-console) ! (memq (device-type) '(x gtk)))))) ((vm-mime-types-match "multipart" type) t) *************** *** 3427,3429 **** (not native-sound-only-on-console) ! (eq (device-type) 'x)))) (let ((start (point-marker)) end tempfile --- 3427,3429 ---- (not native-sound-only-on-console) ! (memq (device-type) '(x gtk))))) (let ((start (point-marker)) end tempfile *************** *** 3994,3996 **** (defun vm-mime-charset-internally-displayable-p (name) ! (cond ((and vm-xemacs-mule-p (memq (device-type) '(x mswindows))) (or (vm-string-assoc name vm-mime-mule-charset-to-coding-alist) --- 3994,3996 ---- (defun vm-mime-charset-internally-displayable-p (name) ! (cond ((and vm-xemacs-mule-p (memq (device-type) '(x gtk mswindows))) (or (vm-string-assoc name vm-mime-mule-charset-to-coding-alist) *** dist/vm-startup.el.dist Mon Mar 3 23:53:30 2003 --- vm-startup.el Wed Mar 5 00:02:38 2003 *************** *** 354,356 **** ! This is VM 7.09. --- 354,356 ---- ! This is VM 7.10. *** dist/vm-vars.el.dist Mon Mar 3 23:53:30 2003 --- vm-vars.el Tue Mar 4 23:42:24 2003 *************** *** 3725,3726 **** --- 3725,3734 ---- + (defvar vm-stunnel-wants-configuration-file + (and (stringp 'vm-stunnel-program) + (not (string-match "client mode" + (shell-command-to-string + (format "%s -h" vm-stunnel-program))))) + "Non-nil if stunnel is controlled by a configuration file. + An older stunnel version used command line arguments instead.") + (defcustom vm-temp-file-directory *************** *** 4768,4769 **** --- 4776,4778 ---- (defvar vm-stunnel-random-data-file nil) + (defvar vm-stunnel-configuration-file nil) (defvar vm-fsfemacs-cached-scroll-bar-width nil) *** dist/vm-version.el.dist Mon Mar 3 23:53:30 2003 --- vm-version.el Wed Mar 5 00:02:38 2003 *************** *** 4,6 **** ! (defconst vm-version "7.09" "Version number of VM.") --- 4,6 ---- ! (defconst vm-version "7.10" "Version number of VM.") *************** *** 93,95 **** (cond (vm-xemacs-p ! (memq (device-type) '(x mswindows))) (vm-fsfemacs-p --- 93,95 ---- (cond (vm-xemacs-p ! (memq (device-type) '(x gtk mswindows))) (vm-fsfemacs-p *************** *** 98,100 **** (defun vm-images-possible-here-p () ! (or (and vm-xemacs-p (memq (device-type) '(x mswindows))) (and vm-fsfemacs-p window-system --- 98,100 ---- (defun vm-images-possible-here-p () ! (or (and vm-xemacs-p (memq (device-type) '(x gtk mswindows))) (and vm-fsfemacs-p window-system