comparison lisp/vm/vm-mime.el @ 40:7e54bd776075 r19-15b103

Import from CVS: tag r19-15b103
author cvs
date Mon, 13 Aug 2007 08:54:25 +0200
parents c53a95d3c46d
children 8b8b7f3559a2
comparison
equal deleted inserted replaced
39:06f275776fba 40:7e54bd776075
382 (while (< inputpos end) 382 (while (< inputpos end)
383 (setq char (char-after inputpos)) 383 (setq char (char-after inputpos))
384 (cond ((= char ?\n) 384 (cond ((= char ?\n)
385 (vm-insert-char char 1 nil work-buffer) 385 (vm-insert-char char 1 nil work-buffer)
386 (setq cols 0)) 386 (setq cols 0))
387 ((and (= char 32) (not (= ?\n (char-after (1+ inputpos))))) 387 ((and (= char 32)
388 (not (= (1+ inputpos) end))
389 (not (= ?\n (char-after (1+ inputpos)))))
388 (vm-insert-char char 1 nil work-buffer) 390 (vm-insert-char char 1 nil work-buffer)
389 (vm-increment cols)) 391 (vm-increment cols))
390 ((or (< char 33) (> char 126) (= char 61) 392 ((or (< char 33) (> char 126) (= char 61)
391 (and quote-from (= cols 0) (let ((case-fold-search nil)) 393 (and quote-from (= cols 0) (let ((case-fold-search nil))
392 (looking-at "From ")))) 394 (looking-at "From "))))
2573 (forward-char -1) 2575 (forward-char -1)
2574 (insert-buffer-substring object) 2576 (insert-buffer-substring object)
2575 (delete-char 1))) 2577 (delete-char 1)))
2576 ((stringp object) 2578 ((stringp object)
2577 (let ((overridding-file-coding-system 'no-conversion)) 2579 (let ((overridding-file-coding-system 'no-conversion))
2578 (insert-file-contents-literally object)))) 2580 (insert-before-markers " ")
2581 (forward-char -1)
2582 (insert-file-contents-literally object)
2583 (delete-char 1))))
2579 ;; gather information about the object from the extent. 2584 ;; gather information about the object from the extent.
2580 (if (setq already-mimed (vm-extent-property e 'vm-mime-encoded)) 2585 (if (setq already-mimed (vm-extent-property e 'vm-mime-encoded))
2581 (setq layout (vm-mime-parse-entity 2586 (setq layout (vm-mime-parse-entity
2582 nil (list "text/plain" "charset=us-ascii") 2587 nil (list "text/plain" "charset=us-ascii")
2583 "7bit") 2588 "7bit")