From de90eb61e48c4b097eccf33b26295d026cb9fac8 Mon Sep 17 00:00:00 2001 From: yamaoka Date: Tue, 18 Mar 2003 04:18:10 +0000 Subject: [PATCH] Synch to Oort Gnus 200303180416. --- lisp/ChangeLog | 13 +++++++++++++ lisp/gnus-art.el | 1 - lisp/lpath.el | 10 +++++----- lisp/mm-view.el | 4 ++-- 4 files changed, 20 insertions(+), 8 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index c7dd531..606fe75 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,16 @@ +2003-03-18 Katsumi Yamaoka + + * mm-view.el (mm-setup-w3m): Set w3m-display-inline-images to + the value of mm-inline-text-html-with-images. + (mm-inline-text-html-render-with-w3m): Don't bind + w3m-display-inline-images. + + * gnus-art.el (gnus-article-wash-html-with-w3m): Don't bind + w3m-display-inline-images. + + * lpath.el: Bind w3m-display-inline-images; bind mm-w3m-mode-map + regardless of an Emacs flavor. + 2003-03-18 Lars Magne Ingebrigtsen * gnus.el (gnus-version-number): Bump. diff --git a/lisp/gnus-art.el b/lisp/gnus-art.el index f1ad33d..f11da42 100644 --- a/lisp/gnus-art.el +++ b/lisp/gnus-art.el @@ -2397,7 +2397,6 @@ If READ-CHARSET, ask for a coding system." (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 diff --git a/lisp/lpath.el b/lisp/lpath.el index 90bb882..f80ced9 100644 --- a/lisp/lpath.el +++ b/lisp/lpath.el @@ -22,10 +22,11 @@ vcard-pretty-print w32-focus-frame w3m-charset-to-coding-system x-focus-frame)) (maybe-bind '(filladapt-mode - mc-pgp-always-sign rmail-enable-mime-composing + mc-pgp-always-sign mm-w3m-mode-map rmail-enable-mime-composing rmail-insert-mime-forwarded-message-function w3m-cid-retrieve-function-alist w3m-current-buffer - w3m-meta-content-type-charset-regexp w3m-minor-mode-map)) + w3m-display-inline-images w3m-meta-content-type-charset-regexp + w3m-minor-mode-map)) (if (featurep 'xemacs) (progn @@ -50,8 +51,7 @@ enable-multibyte-characters language-info-alist mark-active mouse-selection-click-count mouse-selection-click-count-buffer pgg-parse-crc24 - temporary-file-directory transient-mark-mode - mm-w3m-mode-map))) + temporary-file-directory transient-mark-mode))) (maybe-fbind '(bbdb-complete-name delete-annotation device-connection dfw-device events-to-keys font-lock-set-defaults frame-device @@ -66,7 +66,7 @@ (maybe-bind '(help-echo-owns-message mail-mode-hook url-package-name url-package-version w3-meta-charset-content-type-regexp - w3-meta-content-type-charset-regexp mm-w3m-mode-map))) + w3-meta-content-type-charset-regexp))) ;; T-gnus. (let ((functions diff --git a/lisp/mm-view.el b/lisp/mm-view.el index b569247..2f4c494 100644 --- a/lisp/mm-view.el +++ b/lisp/mm-view.el @@ -194,7 +194,8 @@ (unless (assq 'gnus-article-mode w3m-cid-retrieve-function-alist) (push (cons 'gnus-article-mode 'mm-w3m-cid-retrieve) w3m-cid-retrieve-function-alist)) - (setq mm-w3m-setup t))) + (setq mm-w3m-setup t)) + (setq w3m-display-inline-images mm-inline-text-html-with-images)) (defun mm-w3m-cid-retrieve (url &rest args) "Insert a content pointed by URL if it has the cid: scheme." @@ -248,7 +249,6 @@ map."))) (delete-region (point-min) (point-max)) (insert (mm-decode-string text charset))) (let ((w3m-safe-url-regexp mm-w3m-safe-url-regexp) - (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 -- 1.7.10.4