*** dist/vm-folder.el.dist Fri Feb 14 16:19:38 2003 --- vm-folder.el Wed Mar 12 12:03:21 2003 *************** *** 3906,3908 **** ;; seems wise to do this so that if the user runs VM ! ;; command here they start with as much of a clean ;; slate as we can provide, given we're currently deep --- 3906,3908 ---- ;; seems wise to do this so that if the user runs VM ! ;; commands here they start with as much of a clean ;; slate as we can provide, given we're currently deep *** dist/vm-mime.el.dist Wed Mar 5 00:05:57 2003 --- vm-mime.el Fri Mar 14 22:44:02 2003 *************** *** 35,36 **** --- 35,56 ---- + (defun vm-make-layout (&rest plist) + (vector + (plist-get plist 'type) + (plist-get plist 'qtype) + (plist-get plist 'encoding) + (plist-get plist 'id) + (plist-get plist 'description) + (plist-get plist 'disposition) + (plist-get plist 'qdisposition) + (plist-get plist 'header-start) + (plist-get plist 'header-end) + (plist-get plist 'body-start) + (plist-get plist 'body-end) + (plist-get plist 'parts) + (plist-get plist 'cache) + (plist-get plist 'message-symbol) + (plist-get plist 'display-error) + (plist-get plist 'layout-is-converted) + (plist-get plist 'unconverted-layout))) + (defun vm-mm-layout-type (e) (aref e 0)) *************** *** 54,55 **** --- 74,76 ---- (defun vm-mm-layout-is-converted (e) (aref e 15)) + (defun vm-mm-layout-unconverted-layout (e) (aref e 16)) *************** *** 70,71 **** --- 91,93 ---- (defun vm-set-mm-layout-is-converted (e c) (asef e 15 c)) + (defun vm-set-mm-layout-unconverted-layout (e layout) (aset e 16 layout)) *************** *** 900,913 **** (throw 'return-value ! (vector '("text/plain" "charset=us-ascii") ! '("text/plain" "charset=us-ascii") ! encoding id description ! disposition qdisposition ! (vm-headers-of m) ! (vm-marker (1- (vm-text-of m))) ! (vm-text-of m) ! (vm-text-end-of m) ! nil ! (vm-mime-make-cache-symbol) ! (vm-mime-make-message-symbol m) ! nil nil ))) ((null type) --- 922,938 ---- (throw 'return-value ! (vm-make-layout ! 'type '("text/plain" "charset=us-ascii") ! 'qtype '("text/plain" "charset=us-ascii") ! 'encoding encoding ! 'id id ! 'description description ! 'disposition disposition ! 'qdisposition qdisposition ! 'header-start (vm-headers-of m) ! 'header-end (vm-marker (1- (vm-text-of m))) ! 'body-start (vm-text-of m) ! 'body-end (vm-text-end-of m) ! 'cache (vm-mime-make-cache-symbol) ! 'message-symbol (vm-mime-make-message-symbol m) ! ))) ((null type) *************** *** 916,928 **** (vm-mime-error "MIME part missing header/body separator line")) ! (vector default-type default-type ! encoding id description ! disposition qdisposition ! (vm-marker (point-min)) ! (vm-marker (1- (point))) ! (vm-marker (point)) ! (vm-marker (point-max)) ! nil ! (vm-mime-make-cache-symbol) ! (vm-mime-make-message-symbol m) ! nil nil )) ((null (string-match "[^/ ]+/[^/ ]+" (car type))) --- 941,957 ---- (vm-mime-error "MIME part missing header/body separator line")) ! (vm-make-layout ! 'type default-type ! 'qtype default-type ! 'encoding encoding ! 'id id ! 'description description ! 'disposition disposition ! 'qdisposition qdisposition ! 'header-start (vm-marker (point-min)) ! 'header-body (vm-marker (1- (point))) ! 'body-start (vm-marker (point)) ! 'body-end (vm-marker (point-max)) ! 'cache (vm-mime-make-cache-symbol) ! 'message-symbol (vm-mime-make-message-symbol m) ! )) ((null (string-match "[^/ ]+/[^/ ]+" (car type))) *************** *** 962,970 **** (throw 'return-value ! (vector type qtype encoding id description ! disposition qdisposition ! (vm-marker (point-min)) ! (vm-marker (1- (point))) ! (vm-marker (point)) ! (vm-marker (point-max)) ! (list (save-restriction --- 991,1005 ---- (throw 'return-value ! (vm-make-layout ! 'type type ! 'qtype qtype ! 'encoding encoding ! 'id id ! 'description description ! 'disposition disposition ! 'qdisposition qdisposition ! 'header-start (vm-marker (point-min)) ! 'header-end (vm-marker (1- (point))) ! 'body-start (vm-marker (point)) ! 'body-end '(vm-marker (point-max)) ! 'parts (list (save-restriction *************** *** 972,976 **** (vm-mime-parse-entity-safe m c-t c-t-e t))) ! (vm-mime-make-cache-symbol) ! (vm-mime-make-message-symbol m) ! nil nil ))) (t --- 1007,1011 ---- (vm-mime-parse-entity-safe m c-t c-t-e t))) ! 'cache (vm-mime-make-cache-symbol) ! 'message-symbol (vm-mime-make-message-symbol m) ! ))) (t *************** *** 980,991 **** (throw 'return-value ! (vector type qtype encoding id description ! disposition qdisposition ! (vm-marker (point-min)) ! (vm-marker (1- (point))) ! (vm-marker (point)) ! (vm-marker (point-max)) ! nil ! (vm-mime-make-cache-symbol) ! (vm-mime-make-message-symbol m) ! nil nil )))) (setq p (cdr type) --- 1015,1031 ---- (throw 'return-value ! (vm-make-layout ! 'type type ! 'qtype qtype ! 'encoding encoding ! 'id id ! 'description description ! 'disposition disposition ! 'qdisposition qdisposition ! 'header-start (vm-marker (point-min)) ! 'header-end (vm-marker (1- (point))) ! 'body-start (vm-marker (point)) ! 'body-end (vm-marker (point-max)) ! 'cache (vm-mime-make-cache-symbol) ! 'message-symbol (vm-mime-make-message-symbol m) ! )))) (setq p (cdr type) *************** *** 1039,1050 **** (vm-mime-error "MIME part missing header/body separator line")) ! (vector type qtype encoding id description ! disposition qdisposition ! (vm-marker (point-min)) ! (vm-marker (1- (point))) ! (vm-marker (point)) ! (vm-marker (point-max)) ! (nreverse multipart-list) ! (vm-mime-make-cache-symbol) ! (vm-mime-make-message-symbol m) ! nil nil ))))))) --- 1079,1096 ---- (vm-mime-error "MIME part missing header/body separator line")) ! (vm-make-layout ! 'type type ! 'qtype qtype ! 'encoding encoding ! 'id id ! 'description description ! 'disposition disposition ! 'qdisposition qdisposition ! 'header-start (vm-marker (point-min)) ! 'header-end (vm-marker (1- (point))) ! 'body-start (vm-marker (point)) ! 'body-end (vm-marker (point-max)) ! 'parts (nreverse multipart-list) ! 'cache (vm-mime-make-cache-symbol) ! 'message-symbol (vm-mime-make-message-symbol m) ! ))))))) *************** *** 1073,1090 **** (vm-marker (point-max))))) ! (vector '("error/error") '("error/error") ! (vm-determine-proper-content-transfer-encoding text text-end) ! nil ! ;; cram the error message into the description slot ! (car (cdr error-data)) ! ;; mark as an attachment to improve the chance that the user ! ;; will see the description. ! '("attachment") '("attachment") ! header ! (vm-marker (1- text)) ! text ! text-end ! nil ! (vm-mime-make-cache-symbol) ! (vm-mime-make-message-symbol m) ! nil nil))))) --- 1119,1137 ---- (vm-marker (point-max))))) ! (vm-make-layout ! 'type '("error/error") ! 'qtype '("error/error") ! 'encoding (vm-determine-proper-content-transfer-encoding text text-end) ! ;; cram the error message into the description slot ! 'description (car (cdr error-data)) ! ;; mark as an attachment to improve the chance that the user ! ;; will see the description. ! 'disposition '("attachment") ! 'qdisposition '("attachment") ! 'header-start header ! 'header-end (vm-marker (1- text)) ! 'body-start text ! 'body-end text-end ! 'cache (vm-mime-make-cache-symbol) ! 'message-symbol (vm-mime-make-message-symbol m) ! ))))) *************** *** 1416,1432 **** (nth 1 ooo)) ! (vector (append (list (nth 1 ooo)) (cdr (vm-mm-layout-type layout))) ! (append (list (nth 1 ooo)) (cdr (vm-mm-layout-type layout))) ! "binary" ! (vm-mm-layout-id layout) ! (vm-mm-layout-description layout) ! (vm-mm-layout-disposition layout) ! (vm-mm-layout-qdisposition layout) ! (vm-marker (point-min)) ! (vm-marker (1- (point))) ! (vm-marker (point)) ! (vm-marker (point-max)) ! nil ! (vm-mime-make-cache-symbol) ! (vm-mime-make-message-symbol (vm-mm-layout-message layout)) ! nil t ))))) --- 1463,1482 ---- (nth 1 ooo)) ! (vm-make-layout ! 'type (append (list (nth 1 ooo)) (cdr (vm-mm-layout-type layout))) ! 'qtype (append (list (nth 1 ooo)) (cdr (vm-mm-layout-type layout))) ! 'encoding "binary" ! 'id (vm-mm-layout-id layout) ! 'description (vm-mm-layout-description layout) ! 'disposition (vm-mm-layout-disposition layout) ! 'qdisposition (vm-mm-layout-qdisposition layout) ! 'header-start (vm-marker (point-min)) ! 'header-end (vm-marker (1- (point))) ! 'body-start (vm-marker (point)) ! 'body-end (vm-marker (point-max)) ! 'cache (vm-mime-make-cache-symbol) ! 'message-symbol (vm-mime-make-message-symbol ! (vm-mm-layout-message layout)) ! 'layout-is-converted t ! 'unconverted-layout layout ! ))))) *************** *** 1464,1480 **** (setq layout ! (vector (copy-sequence (vm-mm-layout-type layout)) ! (copy-sequence (vm-mm-layout-type layout)) ! "binary" ! (vm-mm-layout-id layout) ! (vm-mm-layout-description layout) ! (vm-mm-layout-disposition layout) ! (vm-mm-layout-qdisposition layout) ! (vm-marker (point-min)) ! (vm-marker (1- (point))) ! (vm-marker (point)) ! (vm-marker (point-max)) ! nil ! (vm-mime-make-cache-symbol) ! (vm-mime-make-message-symbol (vm-mm-layout-message layout)) ! nil t )) (vm-mime-set-parameter layout "charset" (nth 1 ooo)) --- 1514,1533 ---- (setq layout ! (vm-make-layout ! 'type (copy-sequence (vm-mm-layout-type layout)) ! 'qtype (copy-sequence (vm-mm-layout-type layout)) ! 'encoding "binary" ! 'id (vm-mm-layout-id layout) ! 'description (vm-mm-layout-description layout) ! 'disposition (vm-mm-layout-disposition layout) ! 'qdisposition (vm-mm-layout-qdisposition layout) ! 'header-start (vm-marker (point-min)) ! 'header-body (vm-marker (1- (point))) ! 'body-start (vm-marker (point)) ! 'body-end (vm-marker (point-max)) ! 'cache (vm-mime-make-cache-symbol) ! 'message-symbol (vm-mime-make-message-symbol ! (vm-mm-layout-message layout)) ! 'layout-is-converted t ! 'onconverted-layout layout ! )) (vm-mime-set-parameter layout "charset" (nth 1 ooo)) *************** *** 4799,4800 **** --- 4852,4855 ---- (widen) + (if (vm-mm-layout-is-converted layout) + (setq layout (vm-mm-layout-unconverted-layout layout))) (goto-char (vm-mm-layout-header-start layout)) *** dist/vm-mouse.el.dist Mon Mar 3 23:53:30 2003 --- vm-mouse.el Wed Mar 12 23:19:53 2003 *************** *** 279,281 **** (append vm-konqueror-client-program-switches ! (list "openURL" url)))))) (message "Sending URL to Konqueror... done")) --- 279,282 ---- (append vm-konqueror-client-program-switches ! (list "openURL" url)))) ! (vm-mouse-send-url-to-konqueror url t))) (message "Sending URL to Konqueror... done")) *** dist/vm-pop.el.dist Wed Mar 5 23:39:04 2003 --- vm-pop.el Fri Mar 7 12:57:06 2003 *************** *** 453,457 **** vm-stunnel-program ! (nconc (vm-stunnel-random-data-args) ! (list "-W" "-c" "-r" ! (format "%s:%s" host port)) vm-stunnel-program-switches)))) --- 453,456 ---- vm-stunnel-program ! (nconc (vm-stunnel-configuration-args host ! port) vm-stunnel-program-switches)))) *** dist/vm-startup.el.dist Wed Mar 5 23:39:04 2003 --- vm-startup.el Fri Mar 14 22:56:27 2003 *************** *** 376,378 **** ! This is VM 7.11. --- 376,378 ---- ! This is VM 7.12. *** dist/vm-version.el.dist Wed Mar 5 23:39:05 2003 --- vm-version.el Fri Mar 14 22:56:27 2003 *************** *** 4,6 **** ! (defconst vm-version "7.11" "Version number of VM.") --- 4,6 ---- ! (defconst vm-version "7.12" "Version number of VM.")