gnus-art.el (gnus-article-browse-html-save-cid-content,...

gnus-art.el (gnus-article-browse-html-save-cid-content, gnus-article-browse-html-parts): Make cid file names relative

gnus-art.el (gnus-article-browse-html-save-cid-content,...
gnus-art.el (gnus-article-browse-html-save-cid-content, gnus-article-browse-html-parts): Make cid file names relative
6539413d · Katsumi Yamaoka · aaae978c · 6539413d · 6539413d
Commit 6539413d authored Aug 26, 2014 by Katsumi Yamaoka
Hide whitespace changes
Inline Side-by-side

Showing with 28 additions and 20 deletions

lisp/gnus/ChangeLog lisp/gnus/ChangeLog +5 -0

lisp/gnus/gnus-art.el lisp/gnus/gnus-art.el +23 -20

No files found.
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
+2014-08-26  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* gnus-art.el (gnus-article-browse-html-save-cid-content)
+	(gnus-article-browse-html-parts): Make cid file names relative.
+
 2014-08-21  Katsumi Yamaoka  <yamaoka@jpl.org>
  
 	* mm-view.el (mm-display-inline-fontify): Make the working buffer

--- a/lisp/gnus/gnus-art.el
+++ b/lisp/gnus/gnus-art.el
@@ -2806,16 +2806,15 @@ Return file name."
 			      cid handle directory))
 	      (throw 'found file)))
 	   ((equal (concat "<" cid ">") (mm-handle-id handle))
-	    (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))))))))
+	    (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)))))))))

 (defun gnus-article-browse-html-parts (list &optional header)
  "View all \"text/html\" parts from LIST.
@@ -2849,6 +2848,19 @@ message header will be added to the bodies of the \"text/html\" parts."
 		   (mm-enable-multibyte)
 		 (mm-disable-multibyte))
 	       (insert content)
+	       ;; remove <base>
+	       (let ((case-fold-search t))
+		 (goto-char (point-min))
+		 (when (and (search-forward "<head>" nil t)
+			    (progn
+			      (save-restriction
+				(narrow-to-region
+				 (point)
+				 (or (search-forward "</head>" nil t) (point)))
+				(goto-char (point-min)))
+			      (re-search-forward
+			       "[\t\n ]*<base[\t\n ]+[^>]+>[\t\n ]*" nil t)))
+		   (replace-match "\n")))
 	       ;; resolve cid contents
 	       (let ((case-fold-search t)
 		     cid-file)
@@ -2867,16 +2879,7 @@ 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))
-		     (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))))
+		     (replace-match 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