From b301b5f3e046dd2d73ac7259432a1e3f6d826d1b Mon Sep 17 00:00:00 2001 From: yamaoka Date: Wed, 30 Oct 2002 07:53:07 +0000 Subject: [PATCH] Synch with Oort Gnus. --- lisp/ChangeLog | 3 +++ lisp/mm-view.el | 19 ++++++++++--------- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index c7056aa..938df4e 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,8 @@ 2002-10-30 TSUCHIYA Masatoshi + * mm-view.el (mm-w3m-local-map-property): Make it work with older + versions of emacs-w3m than 1.3.3. + * lpath.el: Bind w3m-minor-mode-map. * mm-view.el (mm-w3m-mode-command-alist) diff --git a/lisp/mm-view.el b/lisp/mm-view.el index 4857eb3..d5e5dc3 100644 --- a/lisp/mm-view.el +++ b/lisp/mm-view.el @@ -216,15 +216,16 @@ commands to this map, add them to `w3m-minor-mode-map' instead of this map."))) (defun mm-w3m-local-map-property () - (if (or (featurep 'xemacs) - (>= emacs-major-version 21)) - (list 'keymap w3m-minor-mode-map) - (list 'local-map - (or mm-w3m-mode-map - (progn - (setq mm-w3m-mode-map (copy-keymap w3m-minor-mode-map)) - (set-keymap-parent mm-w3m-mode-map gnus-article-mode-map) - mm-w3m-mode-map))))) + (when (and (boundp 'w3m-minor-mode-map) w3m-minor-mode-map) + (if (or (featurep 'xemacs) + (>= emacs-major-version 21)) + (list 'keymap w3m-minor-mode-map) + (list 'local-map + (or mm-w3m-mode-map + (progn + (setq mm-w3m-mode-map (copy-keymap w3m-minor-mode-map)) + (set-keymap-parent mm-w3m-mode-map gnus-article-mode-map) + mm-w3m-mode-map)))))) (defun mm-inline-text-html-render-with-w3m (handle) "Render a text/html part using emacs-w3m." -- 1.7.10.4