comparison lisp/vm/vm-reply.el @ 100:4be1180a9e89 r20-1b2

Import from CVS: tag r20-1b2
author cvs
date Mon, 13 Aug 2007 09:15:11 +0200
parents 0d2f883870bc
children a145efe76779
comparison
equal deleted inserted replaced
99:2d83cbd90d8d 100:4be1180a9e89
289 parts) 289 parts)
290 (vm-insert-region-from-buffer (vm-buffer-of message) 290 (vm-insert-region-from-buffer (vm-buffer-of message)
291 (vm-headers-of message) 291 (vm-headers-of message)
292 (vm-text-of message)) 292 (vm-text-of message))
293 (cond ((vm-mime-types-match "multipart" type) 293 (cond ((vm-mime-types-match "multipart" type)
294 (setq parts (vm-mm-layout-parts o))) 294 (setq parts (copy-sequence (vm-mm-layout-parts o))))
295 (t (setq parts (list o)))) 295 (t (setq parts (list o))))
296 (while parts 296 (while parts
297 (cond ((vm-mime-text-type-p (car parts)) 297 (cond ((vm-mime-text-type-p (car parts))
298 (if (vm-mime-display-internal-text/plain (car parts) t) 298 (if (vm-mime-display-internal-text/plain (car parts) t)
299 nil 299 nil
300 ;; charset problems probably 300 ;; charset problems probably
301 ;; just dump the raw bits 301 ;; just dump the raw bits
302 (vm-mime-insert-mime-body (car parts)) 302 (vm-mime-insert-mime-body (car parts))
303 (vm-mime-transfer-decode-region (car parts) 303 (vm-mime-transfer-decode-region (car parts)
304 start (point))))) 304 start (point)))
305 (setq parts (cdr parts))) 305 (setq parts (cdr parts)))
306 ((vm-mime-composite-type-p
307 (car (vm-mm-layout-type (car parts))))
308 (setq parts (nconc (copy-sequence
309 (vm-mm-layout-parts
310 (car parts)))
311 (cdr parts))))
312 (t (setq parts (cdr parts)))))
306 (setq end (point-marker))) 313 (setq end (point-marker)))
307 (set-buffer (vm-buffer-of message)) 314 (set-buffer (vm-buffer-of message))
308 (save-restriction 315 (save-restriction
309 (widen) 316 (widen)
310 (append-to-buffer b (vm-headers-of message) 317 (append-to-buffer b (vm-headers-of message)
648 (let ((b (current-buffer))) 655 (let ((b (current-buffer)))
649 (set-buffer mail-buffer) 656 (set-buffer mail-buffer)
650 (mail-text) 657 (mail-text)
651 (vm-mime-attach-object b "multipart/digest" 658 (vm-mime-attach-object b "multipart/digest"
652 (list (concat "boundary=\"" 659 (list (concat "boundary=\""
653 boundary "\"")) t) 660 boundary "\"")) nil t)
654 (add-hook 'kill-buffer-hook 661 (add-hook 'kill-buffer-hook
655 (list 'lambda () 662 (list 'lambda ()
656 (list 'if (list 'eq mail-buffer '(current-buffer)) 663 (list 'if (list 'eq mail-buffer '(current-buffer))
657 (list 'kill-buffer b)))))) 664 (list 'kill-buffer b))))))
658 (mail-position-on-field "To")) 665 (mail-position-on-field "To"))
860 (let ((b (current-buffer))) 867 (let ((b (current-buffer)))
861 (set-buffer mail-buffer) 868 (set-buffer mail-buffer)
862 (mail-text) 869 (mail-text)
863 (vm-mime-attach-object b "multipart/digest" 870 (vm-mime-attach-object b "multipart/digest"
864 (list (concat "boundary=\"" 871 (list (concat "boundary=\""
865 boundary "\"")) t) 872 boundary "\"")) nil t)
866 (add-hook 'kill-buffer-hook 873 (add-hook 'kill-buffer-hook
867 (list 'lambda () 874 (list 'lambda ()
868 (list 'if (list 'eq mail-buffer '(current-buffer)) 875 (list 'if (list 'eq mail-buffer '(current-buffer))
869 (list 'kill-buffer b)))))) 876 (list 'kill-buffer b))))))
870 (mail-position-on-field "To") 877 (mail-position-on-field "To")
953 (use-local-map vm-mail-mode-map) 960 (use-local-map vm-mail-mode-map)
954 ;; make mail-mode-map the parent of this vm-mail-mode-map, if we can. 961 ;; make mail-mode-map the parent of this vm-mail-mode-map, if we can.
955 ;; do it only once. 962 ;; do it only once.
956 (if (not vm-mail-mode-map-parented) 963 (if (not vm-mail-mode-map-parented)
957 (cond ((fboundp 'set-keymap-parents) 964 (cond ((fboundp 'set-keymap-parents)
958 (set-keymap-parents vm-mail-mode-map (list mail-mode-map))) 965 (set-keymap-parents vm-mail-mode-map (list mail-mode-map))
966 (setq vm-mail-mode-map-parented t))
959 ((consp mail-mode-map) 967 ((consp mail-mode-map)
960 (nconc vm-mail-mode-map mail-mode-map) 968 (nconc vm-mail-mode-map mail-mode-map)
961 (setq vm-mail-mode-map-parented t)))) 969 (setq vm-mail-mode-map-parented t))))
962 (setq vm-mail-buffer folder-buffer 970 (setq vm-mail-buffer folder-buffer
963 mode-popup-menu (and vm-use-menus vm-popup-menu-on-mouse-3 971 mode-popup-menu (and vm-use-menus vm-popup-menu-on-mouse-3