[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] trunk r117747: gnus-art.el (gnus-article-browse-html-save-
|
From: |
Katsumi Yamaoka |
|
Subject: |
[Emacs-diffs] trunk r117747: gnus-art.el (gnus-article-browse-html-save-cid-content, gnus-article-browse-html-parts): Revert last change that breaks links other than cid contents |
|
Date: |
Tue, 26 Aug 2014 23:55:57 +0000 |
|
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 117747
revision-id: address@hidden
parent: address@hidden
committer: Katsumi Yamaoka <address@hidden>
branch nick: trunk
timestamp: Tue 2014-08-26 23:56:11 +0000
message:
gnus-art.el (gnus-article-browse-html-save-cid-content,
gnus-article-browse-html-parts): Revert last change that breaks links other
than cid contents
modified:
lisp/gnus/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1433
lisp/gnus/gnus-art.el gnusart.el-20091113204419-o5vbwnq5f7feedwu-1108
=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog 2014-08-26 23:28:22 +0000
+++ b/lisp/gnus/ChangeLog 2014-08-26 23:56:11 +0000
@@ -1,6 +1,12 @@
2014-08-26 Katsumi Yamaoka <address@hidden>
* gnus-art.el (gnus-article-browse-html-save-cid-content)
+ (gnus-article-browse-html-parts):
+ Revert last change that breaks links other than cid contents.
+
+2014-08-26 Katsumi Yamaoka <address@hidden>
+
+ * 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 <address@hidden>
=== modified file 'lisp/gnus/gnus-art.el'
--- a/lisp/gnus/gnus-art.el 2014-08-26 23:28:22 +0000
+++ b/lisp/gnus/gnus-art.el 2014-08-26 23:56:11 +0000
@@ -2806,15 +2806,16 @@
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.
@@ -2848,19 +2849,6 @@
(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)
@@ -2879,7 +2867,16 @@
(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
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] trunk r117747: gnus-art.el (gnus-article-browse-html-save-cid-content, gnus-article-browse-html-parts): Revert last change that breaks links other than cid contents,
Katsumi Yamaoka <=