X-Git-Url: http://cgit.sxemacs.org/?p=gnus;a=blobdiff_plain;f=lisp%2Fgnus-art.el;h=d55c703a3daeb445261f1707e7136829fc4c8ae3;hp=d4bbfff48f23188e98320cf8a2b15d1e03d66688;hb=83e840aefbed659a6cae139b4a0b2a04f003f3c9;hpb=3557392c7682dc8b827fb3f49f785ded6ffcc62e
diff --git a/lisp/gnus-art.el b/lisp/gnus-art.el
index d4bbfff48..d55c703a3 100644
--- a/lisp/gnus-art.el
+++ b/lisp/gnus-art.el
@@ -2807,15 +2807,16 @@ Return file name."
cid handle directory))
(throw 'found file)))
((equal (concat "<" cid ">") (mm-handle-id handle))
- (setq file (or (mm-handle-filename handle)
- (concat
- (make-temp-name "cid")
- (car (rassoc (car (mm-handle-type handle))
- mailcap-mime-extensions)))))
- (mm-save-part-to-file handle (expand-file-name file directory))
- (throw 'found (concat (file-name-nondirectory
- (directory-file-name directory))
- "/" file)))))))))
+ (setq file
+ (expand-file-name
+ (or (mm-handle-filename handle)
+ (concat
+ (make-temp-name "cid")
+ (car (rassoc (car (mm-handle-type handle))
+ mailcap-mime-extensions))))
+ directory))
+ (mm-save-part-to-file handle file)
+ (throw 'found file))))))))
(defun gnus-article-browse-html-parts (list &optional header)
"View all \"text/html\" parts from LIST.
@@ -2849,19 +2850,6 @@ message header will be added to the bodies of the \"text/html\" parts."
(mm-enable-multibyte)
(mm-disable-multibyte))
(insert content)
- ;; remove
- (let ((case-fold-search t))
- (goto-char (point-min))
- (when (and (search-forward "" nil t)
- (progn
- (save-restriction
- (narrow-to-region
- (point)
- (or (search-forward "" nil t) (point)))
- (goto-char (point-min)))
- (re-search-forward
- "[\t\n ]*]+>[\t\n ]*" nil t)))
- (replace-match "\n")))
;; resolve cid contents
(let ((case-fold-search t)
cid-file)
@@ -2880,7 +2868,16 @@ message header will be added to the bodies of the \"text/html\" parts."
(with-current-buffer gnus-article-buffer
gnus-article-mime-handles)
cid-dir))
- (replace-match cid-file nil nil nil 1))))
+ (when (eq system-type 'cygwin)
+ (setq cid-file
+ (concat "/" (substring
+ (with-output-to-string
+ (call-process "cygpath" nil
+ standard-output
+ nil "-m" cid-file))
+ 0 -1))))
+ (replace-match (concat "file://" cid-file)
+ nil nil nil 1))))
(unless content (setq content (buffer-string))))
(when (or charset header (not file))
(setq tmp-file (mm-make-temp-file