2002-01-24 Katsumi Yamaoka <yamaoka@jpl.org>
authorKatsumi Yamaoka <yamaoka@jpl.org>
Thu, 24 Jan 2002 06:11:12 +0000 (06:11 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Thu, 24 Jan 2002 06:11:12 +0000 (06:11 +0000)
* lpath.el: Fbind `w3m-region'; bind `w3m-mode-map'.

* mm-decode.el (mm-inline-text-html-renderer): New user option.
(mm-inline-media-tests): Test whether the value of
`mm-inline-text-html-renderer' is a function for text/html.

* mm-view.el (mm-inline-text-html-render-with-w3): New function
separated from `mm-inline-text'.
(mm-w3m-minor-mode): New variable.
(mm-w3m-setup): New variable.
(mm-setup-w3m): New function.
(mm-inline-text-html-render-with-w3m): New function.
(mm-inline-text): Funcall `mm-inline-text-html-renderer' for
text/html.

lisp/ChangeLog
lisp/lpath.el
lisp/mm-decode.el
lisp/mm-view.el

index a84823a..021b979 100644 (file)
@@ -1,3 +1,20 @@
+2002-01-24  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+       * lpath.el: Fbind `w3m-region'; bind `w3m-mode-map'.
+
+       * mm-decode.el (mm-inline-text-html-renderer): New user option.
+       (mm-inline-media-tests): Test whether the value of
+       `mm-inline-text-html-renderer' is a function for text/html.
+
+       * mm-view.el (mm-inline-text-html-render-with-w3): New function
+       separated from `mm-inline-text'.
+       (mm-w3m-minor-mode): New variable.
+       (mm-w3m-setup): New variable.
+       (mm-setup-w3m): New function.
+       (mm-inline-text-html-render-with-w3m): New function.
+       (mm-inline-text): Funcall `mm-inline-text-html-renderer' for
+       text/html.
+
 2002-01-23  Paul Jarc  <prj@po.cwru.edu>
 
        * lpath.el: fbind make-symbolic-link and unix-sync for nnmaildir.
@@ -75,7 +92,7 @@
        (gnus-article-wash-function): New variable.
        (gnus-article-wash-html-with-w3m): New function.
 
-2002-01-20  Bj\e,Av\e(Brn Torkelsson  <torkel@acc.umu.se>
+2002-01-20  Björn Torkelsson  <torkel@acc.umu.se>
 
        * dgnushack.el (dgnushack-compile): Compile smiley-ems for
        XEmacs.
 
        * flow-fill.el (fill-flowed-display-column)
        (fill-flowed-encode-columnq): New variables.  Suggested by
-       Kai.Grossjohann@CS.Uni-Dortmund.DE (Kai Gro\e,A_\e(Bjohann).
+       Kai.Grossjohann@CS.Uni-Dortmund.DE (Kai Großjohann).
        (fill-flowed-encode, fill-flowed): Use them.
 
        * message.el (message-send-news, message-send-mail): Use
        behavior of quit-config.
 
        * message.el (message-make-from): Don't quote fullname.
-       From: Bj\e,Ax\e(Brn Mork <bmork@dod.no>
+       From: Bjørn Mork <bmork@dod.no>
 
        * gnus-group.el (gnus-group-suspend): Don't kill message buffers.
        From: <andre@slamdunknetworks.com>
 
        * gnus-agent.el (gnus-agent-fetch-session): Run hook.
 
-2002-01-03  Kai Gro\e,A_\e(Bjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
+2002-01-03  Kai Großjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
 
        * gnus-start.el (gnus-read-init-file): Don't force coding system
        for ~/.gnus.  From Dave Love <fx@gnu.org>.
        (gnus-picon-transform-address): Insert spec backward, due to the
        incompatibility of gnus-xmas-put-image.
 
-2002-01-02  Pavel Jan\e,Bm\e(Bk  <Pavel@Janik.cz>
+2002-01-02  Pavel Jan~k  <Pavel@Janik.cz>
 
        * gnus-fun.el (gnus-convert-pbm-to-x-face-command): Doc fix.
 
 
        * gnus-win.el (gnus-configure-windows-hook): New hook.
 
-2001-12-29  Sascha L\e,A|\e(Bdecke  <sascha@meta-x.de>
+2001-12-29  Sascha Lüdecke  <sascha@meta-x.de>
 
        * gnus-win.el (gnus-configure-windows): Minimize tree buffer.
 
        * gnus-art.el, gnus-picon.el, gnus-sieve.el, gnus-sum.el:
        * gnus-xmas.el, imap.el, mailcap.el, mm-util.el, nnfolder.el:
        * nnheader.el, nnmail.el: Nil/NIL vs. nil.
-       From  Pavel Jan\e,Bm\e(Bk  <Pavel@Janik.cz>
+       From  Pavel Jan~k  <Pavel@Janik.cz>
 
 2001-12-20 15:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
 
 
        * mm-url.el (executable-find): autoload.
 
-2001-12-12  Pavel Jan\e,Bm\e(Bk  <Pavel@Janik.cz>
+2001-12-12  Pavel Jan~k  <Pavel@Janik.cz>
 
        * gnus-mlspl.el (gnus-group-split-fancy): Doc fix (add reference
        to variable, follow doc-string conventions).
 
        * message.el (message-tab-body-function): Set to nil.
        (message-tab): Use text-mode-map or global-map.
-       Suggested by Kai Gro\e,A_\e(Bjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>.
+       Suggested by Kai Großjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>.
 
 2001-11-30  Simon Josefsson  <jas@extundo.com>
 
        * gnus-agent.el (gnus-agent-write-active): Make sure sym is a cons
        of integers.
 
-2001-11-29  Kai Gro\e,A_\e(Bjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
+2001-11-29  Kai Großjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
 
        * message.el (message-newgroups-header-regexp)
        (message-completion-alist, message-tab-body-function): Use
        (gnus-summary-limit-to-extra): Ditto.
        (gnus-summary-find-matching): Support not-matching argument.
 
-2001-11-25  Kai Gro\e,A_\e(Bjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
+2001-11-25  Kai Großjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
 
        * message.el (message-wash-subject): Use `insert' rather than
        `insert-string', which is deprecated.
 
        * mml2015.el: Mention RFC 3156.
 
-       * mml1991.el: New file.  From Sascha L\e,A|\e(Bdecke <sascha@meta-x.de>.
+       * mml1991.el: New file.  From Sascha Lüdecke <sascha@meta-x.de>.
 
 2001-11-12 13:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
 
 
 2001-11-09  Simon Josefsson  <jas@extundo.com>
 
-       * gnus.el (gnus-local-domain): Fix doc.  From Pavel Jan\e,Bm\e(Bk
+       * gnus.el (gnus-local-domain): Fix doc.  From Pavel Jan~k
        <Pavel@Janik.cz>.
 
-2001-11-09  Kai Gro\e,A_\e(Bjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
+2001-11-09  Kai Großjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
 
        * message.el (message-point-in-header-p): New function.
        (message-do-auto-fill): Use it.
        (nnweb-type-definition): Add google as alias of dejanews.
        (nnweb-google-parse-1): Forward 1 line.
 
-2001-10-26  Kai Gro\e,A_\e(Bjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
+2001-10-26  Kai Großjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
 
        * gnus-msg.el (gnus-summary-mail-forward): Doc fix: add pointer to
        variable `message-forward-ignored-headers'.
 
        * gnus-msg.el (gnus-extended-version): Include
        system-configuration.
-       Suggested by Kai.Grossjohann@CS.Uni-Dortmund.DE (Kai Gro\e,A_\e(Bjohann).
+       Suggested by Kai.Grossjohann@CS.Uni-Dortmund.DE (Kai Großjohann).
 
 2001-10-22  Per Abrahamsen  <abraham@dina.kvl.dk>
 
        (nnimap-split-inbox, nnimap-expunge-search-string)
        (nnimap-importantize-dormant): Remove "*" from doc.
 
-2001-10-20  Kai Gro\e,A_\e(Bjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
+2001-10-20  Kai Großjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
 
        * gnus-sum.el (gnus-summary-limit-to-score): Prompt for score if
        not supplied via prefix arg.  From Lisp, make arg mandatory.
        * message.el (message-do-auto-fill): Avoid calling
        'rfc822-goto-eoh'.
 
-2001-10-20  Kai Gro\e,A_\e(Bjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
+2001-10-20  Kai Großjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
        From Paul Jarc <prj@po.cwru.edu>.
 
        * message.el (message-get-reply-headers): Restructure the logic
        * gnus-msg.el (gnus-post-method): Changed two instances of
        `active' to `current' and one `null' to `not'.
 
-2001-10-16  Kai Gro\e,A_\e(Bjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
+2001-10-16  Kai Großjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
        From Katsumi Yamaoka  <yamaoka@jpl.org>.
 
        * message.el (message-setup-fill-variables): Use
        (mml2015-gpg-decrypt-1): Decanonicalize decrypted MIME
        body. (Mailcrypt seem to do this, but gpg.el doesn't.)
 
-2001-10-16  Kai Gro\e,A_\e(Bjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
+2001-10-16  Kai Großjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
        Patch by Oliver Scholz <oscholz@my.gnus.org>.
 
        * gnus-draft.el (gnus-draft-edit-message): Add text property
        * message.el (message-do-auto-fill): Use gnus-point-at-bol.
        (autoload): Add some autoloads.
 
-2001-10-12  Kai Gro\e,A_\e(Bjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
+2001-10-12  Kai Großjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
        Suggested by Oliver Scholz <epameinondas@gmx.de>.
 
        * message.el (message-do-auto-fill): New function.  Like
        * gnus-sum.el (gnus-summary-extract-address-component): New function.
        (gnus-summary-from-or-to-or-newsgroups): Optimize.
 
-2001-09-29  Kai Gro\e,A_\e(Bjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
+2001-09-29  Kai Großjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
 
        * message.el (message-mode-map): Keybinding for `gnus-delay-article'.
        (message-mode-menu): Menu item for same.
        S. Socha <robin-dated-1001857693.185e29@socha.net>.
 
 2001-09-27 11:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
-       From Gerd M\e,Av\e(Bllmann <gerd@gnu.org>.
+       From Gerd Möllmann <gerd@gnu.org>.
 
        * gnus-ems.el (gnus-article-display-xface): Insert xface after
        previous ones.
        * gnus-group.el (gnus-group-catchup): Update expire marks in
        backend.  Also, if ALL also set expire marks on tick/dormant.
 
-2001-09-20  Kai Gro\e,A_\e(Bjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
+2001-09-20  Kai Großjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
 
        * message.el (message-tab-body-function): New variable.
        * message.el (message-tab): Use it.
 2001-09-17 08:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
 
        * gnus-srvr.el (gnus-server-mode): Fix bogus fontification.
-       From Gerd M\e,Av\e(Bllmann <gerd@gnu.org>.
+       From Gerd Möllmann <gerd@gnu.org>.
 
 2001-09-17  Didier Verna  <didier@xemacs.org>
 
        * gnus-draft.el (gnus-draft-setup): Don't set mark when there
        isn't an article to set it on (e.g. when you `a' in a group).
 
-2001-09-12  Pavel Jan\e,Bm\e(Bk  <Pavel@Janik.cz>
+2001-09-12  Pavel Jan~k  <Pavel@Janik.cz>
 
        * mm-util.el (mm-charset-synonym-alist): add windows-1250 so we
        can read e-mails from Microsoft Outlook users not using ISO
 
        * gnus-sum.el (gnus-summary-insert-line): Fix.
 
-2001-09-06  Bj\e,Av\e(Brn Torkelsson  <torkel@acc.umu.se>
+2001-09-06  Björn Torkelsson  <torkel@acc.umu.se>
 
        * gnus-sum.el: Bind g-s-t-s to "W g".
        * gnus-sum.el (gnus-summary-make-menu-bar): Add g-s-t-s.
        * gnus-sum.el (gnus-summary-insert-line): Insert forwarded, recent
        and unseen marks.
 
-2001-09-05  Kai Gro\e,A_\e(Bjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
+2001-09-05  Kai Großjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
 
        * nnmail.el (nnmail-split-fancy): Document `junk'.
 
        * gnus-spec.el (gnus-correct-substring): Stopped one character
        before we wanted.
 
-2001-08-19  Pavel Jan\e,Bm\e(Bk  <Pavel@Janik.cz>
+2001-08-19  Pavel Jan~k  <Pavel@Janik.cz>
 
        * earcon.el (earcon-auto-play): Remove unused option.
 
 
        * mml.el (mml-menu): Collapse Attach, Insert and Security submenu.
 
-2001-08-17  Bj\e,Av\e(Brn Torkelsson  <torkel@acc.kth.se>
+2001-08-17  Björn Torkelsson  <torkel@acc.kth.se>
 
        * message.el: rename "Abort Message" to "Postpone Message".
        Remove "Attach file as MIME" from Message menu, it's already in
        * gnus-srvr.el (gnus-server-browse-in-group-buffer): Default to
        nil.
 
-2001-08-15  Kai Gro\e,A_\e(Bjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
+2001-08-15  Kai Großjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
 
        * gnus-delay.el (gnus-delay-article): Allow "01:23" time spec,
        which specifies a time today or tomorrow.
 
 2001-08-15  Simon Josefsson  <jas@extundo.com>
-       From Pavel@Janik.cz (Pavel Jan\e,Bm\e(Bk)
+       From Pavel@Janik.cz (Pavel Jan~k)
 
        * gnus-agent.el (gnus-agent-make-mode-line-string)
        (gnus-agent-toggle-plugged): Use new API.
 
-2001-08-14  Kai Gro\e,A_\e(Bjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
+2001-08-14  Kai Großjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
 
        * gnus-delay.el (gnus-delay-send-drafts): Fix check whether
        deadline has expired.
        * gnus-spec.el (gnus-format-specs): %n is 23 chars.
 
 2001-08-11 09:40:00  Karl Kleinpaste  <karl@charcoal.com>
-       Committed by Kai Gro\e,A_\e(Bjohann.
+       Committed by Kai Großjohann.
 
        * gnus-score.el (gnus-score-string): Fix `match' regexp
        for `extra' header case.
        (nndoc-oe-dbx-dissection): New function.
        (nndoc-oe-dbx-generate-article): New function.
 
-2001-08-11  Kai Gro\e,A_\e(Bjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
+2001-08-11  Kai Großjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
 
        * gnus-delay.el (gnus-delay-send-drafts): Cleaner way to check
        whether deadline has been reached.  Patch from Dan Nicolaescu
 
        * gnus-group.el (gnus-group-make-menu-bar): Ditto.
 
-       * mm-uu.el (mm-uu-dissect): Autoload. From Gerd M\e,Av\e(Bllmann
+       * mm-uu.el (mm-uu-dissect): Autoload. From Gerd Möllmann
        <gerd@gnu.org>.
 
        * gnus-art.el (gnus-output-to-file): Bind file-name-coding-system.
        before remove.
        (gnus-mime-security-show-details): Ditto.
 
-2001-08-04  Kai Gro\e,A_\e(Bjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
+2001-08-04  Kai Großjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
 
        * nnmail.el (nnmail-split-fancy-with-parent): Correct `mapconcat'
        syntax.  Protect string-match against nil string and regexp.
        * gnus-msg.el (gnus-post-method): Refer to `gnus-parameters'.
 
 2001-07-31 17:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
-       Originally from Pavel Jan\e,Bm\e(Bk <Pavel@Janik.cz>
+       Originally from Pavel Jan~k <Pavel@Janik.cz>
 
        * gnus-agent.el (gnus-agent-make-mode-line-string): New function.
        (gnus-agent-toggle-plugged): Use it.
        (gnus-read-newsrc-el-file, gnus-save-newsrc-file)
        (gnus-slave-save-newsrc): Use it.
 
-2001-07-31  Kai Gro\e,A_\e(Bjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
+2001-07-31  Kai Großjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
 
        * gnus-delay.el (gnus-delay-initialize): Use standard define-key
        syntax.
        calls widen.  Thanks to Christoph Conrad
        <christoph.conrad@gmx.de>.
 
-2001-07-29  Kai Gro\e,A_\e(Bjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
+2001-07-29  Kai Großjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
 
        * gnus.el (gnus-summary-line-format): Mention `gnus-sum-thread-*'
        for %B spec.
        * nnheader.el (nnheader-translate-file-chars): cygwin32 is running
        in M$Windows too.
 
-2001-07-26  Kai Gro\e,A_\e(Bjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
+2001-07-26  Kai Großjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
 
        * gnus-delay.el (gnus-delay-send-drafts): Don't `error'.
 
        * mm-decode.el (mm-remove-part): Don't murder the current window (nil).
        (mm-display-external): Use display-term configure.
 
-2001-07-24  Kai Gro\e,A_\e(Bjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
+2001-07-24  Kai Großjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
 
        * gnus-delay.el (gnus-delay-default-hour): New variable.
        (gnus-delay-article): Allow specific date in YYYY-MM-DD format.
        `gnus-check-bogus-newsgroups' just after the native server is
        opened.
 
-2001-07-23  Kai Gro\e,A_\e(Bjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
+2001-07-23  Kai Großjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
 
        * nnmail.el (nnmail-do-request-post): Util function to be used by
        `nnchoke-request-post' for all nnmail-derived backends.
 
        * gnus-msg.el (gnus-setup-message): make-local-hook.
 
-2001-07-22  Kai Gro\e,A_\e(Bjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
+2001-07-22  Kai Großjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
 
        * gnus-delay.el (gnus-delay-article): Fix `read-string' for
        XEmacs.  Allow more units.  Submitted by Karl Kleinpaste
        whether the groups exist, check the right server based on
        `gnus-post-method'.
 
-2001-07-21  Kai Gro\e,A_\e(Bjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
+2001-07-21  Kai Großjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
 
        * gnus-delay.el: New file.
 
        (article-de-base64-unreadable, article-wash-html):
        (gnus-mime-inline-part, gnus-mime-view-part-as-charset): Ditto.
 
-2001-07-21  Kai Gro\e,A_\e(Bjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
+2001-07-21  Kai Großjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
 
        * nnml.el (nnml-request-post): New function.  Can be used for
        annotations in nnml groups.
 
        * gnus-art.el (gnus-article-edit-mode): Use define-derived-mode.
 
-2001-07-16  Kai Gro\e,A_\e(Bjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
+2001-07-16  Kai Großjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
 
        * message.el (message-citation-line-function): Refer to
        gnus-cite-attribution-suffix.
 
-2001-07-15  Pavel Jan\e,Bm\e(Bk <Pavel@Janik.cz>
+2001-07-15  Pavel Jan~k <Pavel@Janik.cz>
 
        * gnus-art.el,...: Error convention changes.
 
 
        * gnus-setup.el (gnus-use-installed-gnus): Typo.
        * Cleanup files.
-       From Pavel@Janik.cz (Pavel Jan\e,Bm\e(Bk).
+       From Pavel@Janik.cz (Pavel Jan~k).
 
 2001-07-13 08:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
 
        (mm-display-external): Use it. Use term to display when no
        window-system.
 
-2001-07-12  Bj\e,Av\e(Brn Torkelsson  <torkel@hpc2n.umu.se>
+2001-07-12  Björn Torkelsson  <torkel@hpc2n.umu.se>
 
        * gnus-srvr.el (gnus-browse-make-menu-bar): Changed one of the
        Browse->Next entries to Browse->Prev
        * gnus-draft.el (gnus-draft-edit-message): Remove Date here.
        (gnus-draft-setup): Remove backlog.
 
-2001-07-10  Pavel Jan\e,Bm\e(Bk <Pavel@Janik.cz>
+2001-07-10  Pavel Jan~k <Pavel@Janik.cz>
 
        * gnus-logic.el, gnus-srvr.el, gnus-vm.el, nnheaderxm.el, nnoo.el:
        Cleanup.
        * gnus-sum.el (gnus-summary-catchup): New argument.
        (gnus-summary-catchup-from-here): New function.
 
-2001-05-30  Kai Gro\e,A_\e(Bjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
+2001-05-30  Kai Großjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
 
        * mm-view.el (mm-inline-image-xemacs): Insert newline, then move
        back, then insert glyph.  (Before, the glyph was inserted first,
        it is not possible to insert a character after a glyph which is at
        the end of a buffer.  Patch by Lloyd Zusman <ljz@asfast.com>.
 
-2001-05-28  Kai Gro\e,A_\e(Bjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
+2001-05-28  Kai Großjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
 
        From Jaap-Henk Hoepman (jhh@xs4all.nl).
 
        mm-destroy-postponed-undisplay-list): New functions.
        (mm-display-external): Use them.
 
-2001-05-27  Kai Gro\e,A_\e(Bjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
+2001-05-27  Kai Großjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
 
        * gnus-salt.el (gnus-tree-highlight-node): Bind `default-high' and
        `default-low' when evaluating `gnus-summary-highlight'.
        as details.
        (mml2015-mailcrypt-clear-verify): Ditto.
 
-2001-05-24  Kai Gro\e,A_\e(Bjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
+2001-05-24  Kai Großjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
        From Nevin Kapur <nevin@jhu.edu>.
 
        * gnus-sum.el (gnus-summary-default-high-score,
        matching subjects.
        (gnus-offer-save-summaries): Clean up.
 
-2001-04-13  Kai Gro\e,A_\e(Bjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
+2001-04-13  Kai Großjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
 
        * nnmail.el (nnmail-split-fancy-with-parent): Add docstring.
 
        supported. Suggest by Jim Meyering <jim@meyering.net>.
 
 2001-04-02  Nevin Kapur  <nevin@jhu.edu>
-       Committed by Kai Gro\e,A_\e(Bjohann <Kai.Grossjohann@CS.Uni-Dortmund.DE>.
+       Committed by Kai Großjohann <Kai.Grossjohann@CS.Uni-Dortmund.DE>.
 
        * nnmail.el (nnmail-split-it): Added check for .* at the end of
        regexp in nnmail-split-fancy.
        * mml2015.el (mml2015-gpg-extract-from): No error.
 
 2001-03-18 23:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
-       From Bj\e,Ax\e(Brn Mork <bmork@dod.no>.
+       From Bjørn Mork <bmork@dod.no>.
 
        * mml2015.el (mml2015-gpg-extract-from): New function.
        (mml2015-gpg-verify): Use it.
        `nnimap-use-nov-p' (it really tested the negative).
        (nnimap-retrieve-headers): Use it.
 
-2001-03-11  Kai Gro\e,A_\e(Bjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
+2001-03-11  Kai Großjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
 
        * message.el (message-generate-headers-first): Update doc.
 
 
        * gnus-draft.el (gnus-draft-reminder): "Confirm to exit?"
 
-2001-02-19  Kai Gro\e,A_\e(Bjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
+2001-02-19  Kai Großjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
 
        * gnus-sum.el (gnus-thread-sort-functions): Doc fix.  Refer to
        gnus-article-sort-functions.
        (gnus-subscribe-hierarchically): Return gnus-subscribe-newsgroup's
        return .
 
-2001-02-12  Kai Gro\e,A_\e(Bjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
+2001-02-12  Kai Großjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
 
        * gnus-cus.el (gnus-score-customize): Doc fix.
 
        * gnus-uu.el (gnus-uu-grab-articles): Shoot down original article
        buffer.
 
-2001-02-07  Kai Gro\e,A_\e(Bjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
+2001-02-07  Kai Großjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
 
        * message.el (message-generate-headers-first): Doc fix.
 
        * nnfolder.el (nnfolder-existing-articles): Reversed, i.e. sorted.
        (nnfolder-request-expire-articles): Use gnus-sorted-intersection.
        (nnfolder-retrieve-headers): Use intersection. Suggested by Jonas
-       Kvarnstr\e,Av\e(Bm <jonkv@ida.liu.se>.
+       Kvarnström <jonkv@ida.liu.se>.
 
 2000-12-30 00:17:38  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
 
        * message.el (message-forward): Save-restriction.
 
-2000-12-21  Kai Gro\e,A_\e(Bjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
+2000-12-21  Kai Großjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
 
        * gnus-art.el (article-treat-dumbquotes): More doc, provided by
        Paul Stevenson <p.stevenson@surrey.ac.uk>
        * message.el (message-font-lock-keywords): use
        message-cite-prefix-regexp.
 
-2000-11-15  Kai Gro\e,A_\e(Bjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
+2000-11-15  Kai Großjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
 
        * gnus-group.el (gnus-group-jump-to-group-prompt): New variable by
-       Stein Arild Str\e,Ax\e(Bmme.
+       Stein Arild Strømme.
        (gnus-group-jump-to-group): Use it.
        (gnus-group-jump-to-group-prompt): Customize.
 
        * gnus-art.el (gnus-mime-display-alternative): Show button if no
        preferred part.
 
-2000-11-07  Kai Gro\e,A_\e(Bjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
+2000-11-07  Kai Großjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
 
        * gnus-sum.el (gnus-move-split-methods): Say that
        `gnus-split-methods' uses file names, whereas this uses group
index 5a2a874..bdcf7a3 100644 (file)
@@ -21,7 +21,7 @@
               find-coding-systems-string
               image-size image-type-available-p insert-image
               image-type-from-file-header
-               make-symbolic-link
+              make-symbolic-link
               make-temp-file message-xmas-redefine
               mail-aliases-setup mm-copy-tree
               mule-write-region-no-coding-system put-image
               sc-cite-regexp set-font-family set-font-size temp-directory
               string-as-multibyte
               tool-bar-add-item tool-bar-add-item-from-menu
-               unix-sync
+              unix-sync
               url-view-url vcard-pretty-print
               url-insert-file-contents
               w3-coding-system-for-mime-charset w3-prepare-buffer w3-region
+              w3m-region
               widget-make-intangible x-defined-colors))
 
 (maybe-bind '(adaptive-fill-first-line-regexp
@@ -58,7 +59,8 @@
              url-current-mime-headers w3-meta-charset-content-type-regexp
              rmail-enable-mime-composing
              rmail-insert-mime-forwarded-message-function
-             w3-meta-content-type-charset-regexp))
+             w3-meta-content-type-charset-regexp
+             w3m-mode-map))
 
 (if (featurep 'xemacs)
     (progn
index 821ef94..2181905 100644 (file)
   `(list ,buffer ,type ,encoding ,undisplayer
         ,disposition ,description ,cache ,id))
 
+(defcustom mm-inline-text-html-renderer
+  (cond ((locate-library "w3")
+        'mm-inline-text-html-render-with-w3)
+       ((locate-library "w3m")
+        'mm-inline-text-html-render-with-w3m))
+  "Function used for rendering HTML contents.  The function will be
+called with a MIME handle as the argument.  There are two pre-defined
+functions: `mm-inline-text-html-render-with-w3', which uses Emacs/w3;
+and `mm-inline-text-html-render-with-w3m', which uses emacs-w3m."
+  :type '(radio (function-item mm-inline-text-html-render-with-w3)
+               (function-item mm-inline-text-html-render-with-w3m)
+               (function))
+  :group 'mime-display)
+
 (defcustom mm-inline-media-tests
   '(("image/jpeg"
      mm-inline-image
     ("text/html"
      mm-inline-text
      (lambda (handle)
-       (locate-library "w3")))
+       (gnus-functionp mm-inline-text-html-renderer)))
     ("text/x-vcard"
      mm-inline-text
      (lambda (handle)
index 06a6c71..d0f3a78 100644 (file)
     (require 'url-vars)
     (setq mm-w3-setup t)))
 
+(defun mm-inline-text-html-render-with-w3 (handle)
+  (mm-setup-w3)
+  (let ((text (mm-get-part handle))
+       (b (point))
+       (url-standalone-mode t)
+       (w3-honor-stylesheets nil)
+       (w3-delay-image-loads t)
+       (url-current-object
+        (url-generic-parse-url (format "cid:%s" (mm-handle-id handle))))
+       (width (window-width))
+       (charset (mail-content-type-get
+                 (mm-handle-type handle) 'charset)))
+    (save-excursion
+      (insert text)
+      (save-restriction
+       (narrow-to-region b (point))
+       (goto-char (point-min))
+       (if (or (and (boundp 'w3-meta-content-type-charset-regexp)
+                    (re-search-forward
+                     w3-meta-content-type-charset-regexp nil t))
+               (and (boundp 'w3-meta-charset-content-type-regexp)
+                    (re-search-forward
+                     w3-meta-charset-content-type-regexp nil t)))
+           (setq charset
+                 (or (let ((bsubstr (buffer-substring-no-properties
+                                     (match-beginning 2)
+                                     (match-end 2))))
+                       (if (fboundp 'w3-coding-system-for-mime-charset)
+                           (w3-coding-system-for-mime-charset bsubstr)
+                         (mm-charset-to-coding-system bsubstr)))
+                     charset)))
+       (delete-region (point-min) (point-max))
+       (insert (mm-decode-string text charset))
+       (save-window-excursion
+         (save-restriction
+           (let ((w3-strict-width width)
+                 ;; Don't let w3 set the global version of
+                 ;; this variable.
+                 (fill-column fill-column)
+                 (w3-honor-stylesheets nil)
+                 (w3-delay-image-loads t)
+                 (url-standalone-mode t))
+             (condition-case var
+                 (w3-region (point-min) (point-max))
+               (error
+                (delete-region (point-min) (point-max))
+                (let ((b (point))
+                      (charset (mail-content-type-get
+                                (mm-handle-type handle) 'charset)))
+                  (if (or (eq charset 'gnus-decoded)
+                          (eq mail-parse-charset 'gnus-decoded))
+                      (save-restriction
+                        (narrow-to-region (point) (point))
+                        (mm-insert-part handle)
+                        (goto-char (point-max)))
+                    (insert (mm-decode-string (mm-get-part handle)
+                                              charset))))
+                (message
+                 "Error while rendering html; showing as text/plain"))))))
+       (mm-handle-set-undisplayer
+        handle
+        `(lambda ()
+           (let (buffer-read-only)
+             (if (functionp 'remove-specifier)
+                 (mapcar (lambda (prop)
+                           (remove-specifier
+                            (face-property 'default prop)
+                            (current-buffer)))
+                         '(background background-pixmap foreground)))
+             (delete-region ,(point-min-marker)
+                            ,(point-max-marker)))))))))
+
+(defvar mm-w3m-minor-mode nil)
+(make-variable-buffer-local 'mm-w3m-minor-mode)
+(defvar mm-w3m-setup nil)
+(defun mm-setup-w3m ()
+  (unless mm-w3m-setup
+    (require 'w3m)
+    (gnus-add-minor-mode 'mm-w3m-minor-mode " w3m" w3m-mode-map)
+    (setq mm-w3m-setup t)))
+
+(defun mm-inline-text-html-render-with-w3m (handle)
+  (mm-setup-w3m)
+  (let ((text (mm-get-part handle))
+       (b (point)))
+    (save-excursion
+      (insert text)
+      (save-restriction
+       (narrow-to-region b (point))
+       (goto-char (point-min))
+       (w3m-region (point-min) (point-max))
+       (setq mm-w3m-minor-mode t))
+      (mm-handle-set-undisplayer
+       handle
+       `(lambda ()
+         (let (buffer-read-only)
+           (setq mm-w3m-minor-mode nil)
+           (if (functionp 'remove-specifier)
+               (mapcar (lambda (prop)
+                         (remove-specifier
+                          (face-property 'default prop)
+                          (current-buffer)))
+                       '(background background-pixmap foreground)))
+           (delete-region ,(point-min-marker)
+                          ,(point-max-marker))))))))
+
 (defun mm-inline-text (handle)
   (let ((type (mm-handle-media-subtype handle))
-       text buffer-read-only)
+       buffer-read-only)
     (cond
      ((equal type "html")
-      (mm-setup-w3)
-      (setq text (mm-get-part handle))
-      (let ((b (point))
-           (url-standalone-mode t)
-           (w3-honor-stylesheets nil)
-           (w3-delay-image-loads t)
-           (url-current-object
-            (url-generic-parse-url (format "cid:%s" (mm-handle-id handle))))
-           (width (window-width))
-           (charset (mail-content-type-get
-                     (mm-handle-type handle) 'charset)))
-       (save-excursion
-         (insert text)
-         (save-restriction
-           (narrow-to-region b (point))
-           (goto-char (point-min))
-           (if (or (and (boundp 'w3-meta-content-type-charset-regexp)
-                        (re-search-forward
-                         w3-meta-content-type-charset-regexp nil t))
-                   (and (boundp 'w3-meta-charset-content-type-regexp)
-                        (re-search-forward
-                         w3-meta-charset-content-type-regexp nil t)))
-               (setq charset
-                     (or (let ((bsubstr (buffer-substring-no-properties
-                                         (match-beginning 2)
-                                         (match-end 2))))
-                           (if (fboundp 'w3-coding-system-for-mime-charset)
-                               (w3-coding-system-for-mime-charset bsubstr)
-                             (mm-charset-to-coding-system bsubstr)))
-                         charset)))
-           (delete-region (point-min) (point-max))
-           (insert (mm-decode-string text charset))
-           (save-window-excursion
-             (save-restriction
-               (let ((w3-strict-width width)
-                     ;; Don't let w3 set the global version of
-                     ;; this variable.
-                     (fill-column fill-column)
-                     (w3-honor-stylesheets nil)
-                     (w3-delay-image-loads t)
-                     (url-standalone-mode t))
-                 (condition-case var
-                     (w3-region (point-min) (point-max))
-                   (error
-                    (delete-region (point-min) (point-max))
-                    (let ((b (point))
-                          (charset (mail-content-type-get
-                                    (mm-handle-type handle) 'charset)))
-                      (if (or (eq charset 'gnus-decoded)
-                              (eq mail-parse-charset 'gnus-decoded))
-                          (save-restriction
-                            (narrow-to-region (point) (point))
-                            (mm-insert-part handle)
-                            (goto-char (point-max)))
-                        (insert (mm-decode-string (mm-get-part handle)
-                                                  charset))))
-                    (message
-                     "Error while rendering html; showing as text/plain"))))))
-           (mm-handle-set-undisplayer
-            handle
-            `(lambda ()
-               (let (buffer-read-only)
-                 (if (functionp 'remove-specifier)
-                     (mapcar (lambda (prop)
-                               (remove-specifier
-                                (face-property 'default prop)
-                                (current-buffer)))
-                             '(background background-pixmap foreground)))
-                 (delete-region ,(point-min-marker)
-                                ,(point-max-marker)))))))))
+      (funcall mm-inline-text-html-renderer handle))
      ((equal type "x-vcard")
       (mm-insert-inline
        handle