From 63b6048485854459729b900519c6274c1b8b9809 Mon Sep 17 00:00:00 2001 From: yamaoka Date: Fri, 1 Feb 2002 08:12:54 +0000 Subject: [PATCH] Synch with Oort Gnus. --- lisp/ChangeLog | 10 ++++++++++ lisp/gnus-art.el | 7 +++++-- lisp/mm-decode.el | 4 +++- lisp/mm-view.el | 7 +++++-- texi/ChangeLog | 6 +++++- texi/emacs-mime.texi | 5 +++-- 6 files changed, 31 insertions(+), 8 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index ead3618..f7c3c7b 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,13 @@ +2002-02-01 Katsumi Yamaoka + + * mm-view.el (mm-inline-text-html-render-with-w3m): Bind + `w3m-safe-url-regexp' with nil if `mm-inline-text-html-with-images' + is non-nil; bind `w3m-force-redisplay' with nil. + + * gnus-art.el (gnus-article-wash-html-with-w3m): Ditto. + + * mm-decode.el (mm-inline-text-html-with-images): Supplement docs. + 2002-01-31 ShengHuo ZHU * nnfolder.el (nnfolder-request-replace-article): Unfold. Don't diff --git a/lisp/gnus-art.el b/lisp/gnus-art.el index 9e22b80..365ccd7 100644 --- a/lisp/gnus-art.el +++ b/lisp/gnus-art.el @@ -2294,8 +2294,11 @@ If READ-CHARSET, ask for a coding system." (mm-setup-w3m) (save-restriction (narrow-to-region (point) (point-max)) - (let ((w3m-safe-url-regexp "\\`cid:") - (w3m-display-inline-images mm-inline-text-html-with-images)) + (let ((w3m-safe-url-regexp (if mm-inline-text-html-with-images + nil + "\\`cid:")) + (w3m-display-inline-images mm-inline-text-html-with-images) + w3m-force-redisplay) (w3m-region (point-min) (point-max))) (when mm-inline-text-html-with-w3m-keymap (add-text-properties diff --git a/lisp/mm-decode.el b/lisp/mm-decode.el index ddb3092..7a9d5bd 100644 --- a/lisp/mm-decode.el +++ b/lisp/mm-decode.el @@ -113,7 +113,9 @@ and `mm-inline-text-html-render-with-w3m', which uses emacs-w3m." "If non-nil, Gnus will allow retrieving images in the HTML contents with tags. It has no effect on Emacs/w3. For emacs-w3m, the value of the option `w3m-display-inline-images' will be bound with -this value." +this value. In addition, the variable `w3m-safe-url-regexp' will be +bound with the value nil if it is non-nil to make emacs-w3m show all +images, however this behavior may be changed in the future." :type 'boolean :group 'mime-display) diff --git a/lisp/mm-view.el b/lisp/mm-view.el index 5b14ca1..0e45776 100644 --- a/lisp/mm-view.el +++ b/lisp/mm-view.el @@ -250,8 +250,11 @@ will not be substituted.") (when charset (delete-region (point-min) (point-max)) (insert (mm-decode-string text charset))) - (let ((w3m-safe-url-regexp "\\`cid:") - (w3m-display-inline-images mm-inline-text-html-with-images)) + (let ((w3m-safe-url-regexp (if mm-inline-text-html-with-images + nil + "\\`cid:")) + (w3m-display-inline-images mm-inline-text-html-with-images) + w3m-force-redisplay) (w3m-region (point-min) (point-max))) (when mm-inline-text-html-with-w3m-keymap (add-text-properties diff --git a/texi/ChangeLog b/texi/ChangeLog index bda655f..4bb5195 100644 --- a/texi/ChangeLog +++ b/texi/ChangeLog @@ -1,8 +1,12 @@ +2002-02-01 Katsumi Yamaoka + + * emacs-mime.texi (Customization): Addition. + 2002-01-31 ShengHuo ZHU * gnus.texi (Posting Styles): Addition. Suggested by Michael Cook . - + 2002-01-30 Katsumi Yamaoka * emacs-mime.texi (Customization): Move emacs-w3m stuff backward; diff --git a/texi/emacs-mime.texi b/texi/emacs-mime.texi index 276de11..4d301c2 100644 --- a/texi/emacs-mime.texi +++ b/texi/emacs-mime.texi @@ -1078,8 +1078,9 @@ It is likely to be intended to verify whether you have read the mail. You can prevent your personal informations from leaking by setting this option to @code{nil} (which is the default). It is currently ignored by Emacs/w3. For emacs-w3m, you may use the command @kbd{t} on the image -anchor to show an image (or @kbd{T} for loading all images) even if it -is @code{nil}. +anchor to show an image even if it is @code{nil}.@footnote{The command +@kbd{T} will load all images. If you have set the option +@code{w3m-key-binding} to @code{info}, use @kbd{i} or @kbd{I} instead.} @item mm-inline-text-html-with-w3m-keymap You can use emacs-w3m command keys in the inlined text/html part by -- 1.7.10.4