projects / gnus / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 3557392)
gnus-art.el (gnus-article-browse-html-save-cid-content, gnus-article-browse-html...
authorKatsumi Yamaoka <yamaoka@jpl.org>
Tue, 26 Aug 2014 23:56:00 +0000 (23:56 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Tue, 26 Aug 2014 23:56:00 +0000 (23:56 +0000)
lisp/ChangeLog patch | blob | history
lisp/gnus-art.el patch | blob | history

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f681d05..2ff6817 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2014-08-26  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+       * 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  <yamaoka@jpl.org>
 
        * gnus-art.el (gnus-article-browse-html-save-cid-content)
diff --git a/lisp/gnus-art.el b/lisp/gnus-art.el
index d4bbfff..d55c703 100644 (file)
--- 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 <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)
@@ -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
Steve's SXEmacs-friendly Gnus repo