2001-07-15 17:42:53 +00:00
|
|
|
;;; mm-view.el --- functions for viewing MIME objects
|
2005-08-06 19:51:42 +00:00
|
|
|
|
|
|
|
|
;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004,
|
2006-01-17 02:39:39 +00:00
|
|
|
;; 2005, 2006 Free Software Foundation, Inc.
|
2000-09-19 13:40:08 +00:00
|
|
|
|
|
|
|
|
;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
|
|
|
|
|
;; This file is part of GNU Emacs.
|
|
|
|
|
|
|
|
|
|
;; GNU Emacs is free software; you can redistribute it and/or modify
|
|
|
|
|
;; it under the terms of the GNU General Public License as published by
|
|
|
|
|
;; the Free Software Foundation; either version 2, or (at your option)
|
|
|
|
|
;; any later version.
|
|
|
|
|
|
|
|
|
|
;; GNU Emacs is distributed in the hope that it will be useful,
|
|
|
|
|
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
|
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
|
;; GNU General Public License for more details.
|
|
|
|
|
|
|
|
|
|
;; You should have received a copy of the GNU General Public License
|
|
|
|
|
;; along with GNU Emacs; see the file COPYING. If not, write to the
|
2005-07-04 17:55:18 +00:00
|
|
|
;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
|
|
|
|
|
;; Boston, MA 02110-1301, USA.
|
2000-09-19 13:40:08 +00:00
|
|
|
|
|
|
|
|
;;; Commentary:
|
|
|
|
|
|
|
|
|
|
;;; Code:
|
|
|
|
|
|
|
|
|
|
(eval-when-compile (require 'cl))
|
|
|
|
|
(require 'mail-parse)
|
|
|
|
|
(require 'mailcap)
|
|
|
|
|
(require 'mm-bodies)
|
|
|
|
|
(require 'mm-decode)
|
|
|
|
|
|
|
|
|
|
(eval-and-compile
|
|
|
|
|
(autoload 'gnus-article-prepare-display "gnus-art")
|
|
|
|
|
(autoload 'vcard-parse-string "vcard")
|
|
|
|
|
(autoload 'vcard-format-string "vcard")
|
|
|
|
|
(autoload 'fill-flowed "flow-fill")
|
2004-09-04 13:13:48 +00:00
|
|
|
(autoload 'html2text "html2text")
|
2001-08-01 13:44:45 +00:00
|
|
|
(unless (fboundp 'diff-mode)
|
|
|
|
|
(autoload 'diff-mode "diff-mode" "" t nil)))
|
2000-09-19 13:40:08 +00:00
|
|
|
|
2005-08-31 13:07:49 +00:00
|
|
|
(defvar gnus-article-mime-handles)
|
|
|
|
|
(defvar gnus-newsgroup-charset)
|
|
|
|
|
(defvar smime-keys)
|
|
|
|
|
(defvar w3m-cid-retrieve-function-alist)
|
|
|
|
|
(defvar w3m-current-buffer)
|
|
|
|
|
(defvar w3m-display-inline-images)
|
|
|
|
|
(defvar w3m-minor-mode-map)
|
|
|
|
|
|
2004-09-04 13:13:48 +00:00
|
|
|
(defvar mm-text-html-renderer-alist
|
|
|
|
|
'((w3 . mm-inline-text-html-render-with-w3)
|
|
|
|
|
(w3m . mm-inline-text-html-render-with-w3m)
|
2006-01-16 09:27:43 +00:00
|
|
|
(w3m-standalone . mm-inline-text-html-render-with-w3m-standalone)
|
2004-09-04 13:13:48 +00:00
|
|
|
(links mm-inline-render-with-file
|
|
|
|
|
mm-links-remove-leading-blank
|
|
|
|
|
"links" "-dump" file)
|
|
|
|
|
(lynx mm-inline-render-with-stdin nil
|
|
|
|
|
"lynx" "-dump" "-force_html" "-stdin" "-nolist")
|
|
|
|
|
(html2text mm-inline-render-with-function html2text))
|
|
|
|
|
"The attributes of renderer types for text/html.")
|
|
|
|
|
|
|
|
|
|
(defvar mm-text-html-washer-alist
|
|
|
|
|
'((w3 . gnus-article-wash-html-with-w3)
|
|
|
|
|
(w3m . gnus-article-wash-html-with-w3m)
|
2006-01-16 09:27:43 +00:00
|
|
|
(w3m-standalone . gnus-article-wash-html-with-w3m-standalone)
|
2004-09-04 13:13:48 +00:00
|
|
|
(links mm-inline-wash-with-file
|
|
|
|
|
mm-links-remove-leading-blank
|
|
|
|
|
"links" "-dump" file)
|
|
|
|
|
(lynx mm-inline-wash-with-stdin nil
|
|
|
|
|
"lynx" "-dump" "-force_html" "-stdin" "-nolist")
|
|
|
|
|
(html2text html2text))
|
|
|
|
|
"The attributes of washer types for text/html.")
|
|
|
|
|
|
2006-02-24 05:02:12 +00:00
|
|
|
(defcustom mm-fill-flowed t
|
|
|
|
|
"If non-nil an format=flowed article will be displayed flowed."
|
|
|
|
|
:type 'boolean
|
|
|
|
|
:version "22.1"
|
|
|
|
|
:group 'mime-display)
|
|
|
|
|
|
2004-09-04 13:13:48 +00:00
|
|
|
;;; Internal variables.
|
|
|
|
|
|
2000-09-19 13:40:08 +00:00
|
|
|
;;;
|
|
|
|
|
;;; Functions for displaying various formats inline
|
|
|
|
|
;;;
|
2004-09-04 13:13:48 +00:00
|
|
|
|
2000-09-19 13:40:08 +00:00
|
|
|
(defun mm-inline-image-emacs (handle)
|
|
|
|
|
(let ((b (point-marker))
|
|
|
|
|
buffer-read-only)
|
|
|
|
|
(put-image (mm-get-image handle) b)
|
2004-09-04 13:13:48 +00:00
|
|
|
(insert "\n\n")
|
2000-09-19 13:40:08 +00:00
|
|
|
(mm-handle-set-undisplayer
|
|
|
|
|
handle
|
2004-09-04 13:13:48 +00:00
|
|
|
`(lambda ()
|
|
|
|
|
(let ((b ,b)
|
|
|
|
|
buffer-read-only)
|
|
|
|
|
(remove-images b b)
|
|
|
|
|
(delete-region b (+ b 2)))))))
|
2000-09-19 13:40:08 +00:00
|
|
|
|
|
|
|
|
(defun mm-inline-image-xemacs (handle)
|
2004-09-04 13:13:48 +00:00
|
|
|
(insert "\n\n")
|
|
|
|
|
(forward-char -2)
|
|
|
|
|
(let ((annot (make-annotation (mm-get-image handle) nil 'text))
|
2000-09-19 13:40:08 +00:00
|
|
|
buffer-read-only)
|
|
|
|
|
(mm-handle-set-undisplayer
|
|
|
|
|
handle
|
|
|
|
|
`(lambda ()
|
2004-09-04 13:13:48 +00:00
|
|
|
(let ((b ,(point-marker))
|
|
|
|
|
buffer-read-only)
|
2000-09-19 13:40:08 +00:00
|
|
|
(delete-annotation ,annot)
|
2004-09-04 13:13:48 +00:00
|
|
|
(delete-region (- b 2) b))))
|
2000-09-19 13:40:08 +00:00
|
|
|
(set-extent-property annot 'mm t)
|
|
|
|
|
(set-extent-property annot 'duplicable t)))
|
|
|
|
|
|
|
|
|
|
(eval-and-compile
|
2000-11-08 23:53:59 +00:00
|
|
|
(if (featurep 'xemacs)
|
2000-09-19 13:40:08 +00:00
|
|
|
(defalias 'mm-inline-image 'mm-inline-image-xemacs)
|
|
|
|
|
(defalias 'mm-inline-image 'mm-inline-image-emacs)))
|
|
|
|
|
|
|
|
|
|
(defvar mm-w3-setup nil)
|
|
|
|
|
(defun mm-setup-w3 ()
|
|
|
|
|
(unless mm-w3-setup
|
|
|
|
|
(require 'w3)
|
|
|
|
|
(w3-do-setup)
|
|
|
|
|
(require 'url)
|
|
|
|
|
(require 'w3-vars)
|
|
|
|
|
(require 'url-vars)
|
|
|
|
|
(setq mm-w3-setup t)))
|
|
|
|
|
|
2004-09-04 13:13:48 +00:00
|
|
|
(defun mm-inline-text-html-render-with-w3 (handle)
|
|
|
|
|
(mm-setup-w3)
|
|
|
|
|
(let ((text (mm-get-part handle))
|
|
|
|
|
(b (point))
|
|
|
|
|
(url-standalone-mode t)
|
|
|
|
|
(url-gateway-unplugged t)
|
|
|
|
|
(w3-honor-stylesheets nil)
|
|
|
|
|
(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
|
2000-09-19 13:40:08 +00:00
|
|
|
(save-restriction
|
2004-09-04 13:13:48 +00:00
|
|
|
(let ((w3-strict-width width)
|
|
|
|
|
;; Don't let w3 set the global version of
|
|
|
|
|
;; this variable.
|
|
|
|
|
(fill-column fill-column))
|
|
|
|
|
(if (or debug-on-error debug-on-quit)
|
|
|
|
|
(w3-region (point-min) (point-max))
|
|
|
|
|
(condition-case ()
|
|
|
|
|
(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-setup nil
|
|
|
|
|
"Whether gnus-article-mode has been setup to use emacs-w3m.")
|
|
|
|
|
|
|
|
|
|
(defun mm-setup-w3m ()
|
|
|
|
|
"Setup gnus-article-mode to use emacs-w3m."
|
|
|
|
|
(unless mm-w3m-setup
|
|
|
|
|
(require 'w3m)
|
|
|
|
|
(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 w3m-display-inline-images mm-inline-text-html-with-images))
|
|
|
|
|
|
|
|
|
|
(defun mm-w3m-cid-retrieve-1 (url handle)
|
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-628
Merge from gnus--rel--5.10
Patches applied:
* miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-55
Update from CVS
2004-10-19 Katsumi Yamaoka <yamaoka@jpl.org>
* lisp/gnus/gnus-sum.el (gnus-update-summary-mark-positions): Search for
dummy marks in the right way.
2004-10-18 Kevin Greiner <kgreiner@compsol.cc>
* lisp/gnus/nnagent.el (nnagent-request-type): Bind gnus-agent to nil to
avoid infinite recursion via gnus-get-function.
2004-10-18 Kevin Greiner <kgreiner@compsol.cc>
* lisp/gnus/gnus-agent.el (gnus-agent-synchronize-group-flags): When
necessary, pass full group name to gnus-request-set-marks.
(gnus-agent-synchronize-group-flags): Added support for sync'ing
tick marks.
(gnus-agent-synchronize-flags-server): Be silent when writing file.
2004-10-18 Kevin Greiner <kgreiner@compsol.cc>
* lisp/gnus/gnus-agent.el (gnus-agent-synchronize-group-flags): Replaced
gnus-request-update-info with explicit code to sync the in-memory
info read flags with the marks being sync'd to the backend.
2004-10-18 Kevin Greiner <kgreiner@compsol.cc>
* lisp/gnus/gnus-agent.el (gnus-agent-possibly-synchronize-flags): Ignore
servers that are offline. Avoids having gnus-agent-toggle-plugged
first ask if you want to open a server and then, even when you
responded with no, asking if you want to synchronize the server's
flags.
(gnus-agent-synchronize-flags-server): Rewrote read loop to handle
multi-line expressions.
(gnus-agent-synchronize-group-flags): New internal function.
Updates marks in memory (in the info structure) AND in the
backend.
(gnus-agent-check-overview-buffer): Fixed range of
deletion to remove entire duplicate line. Fixes merged article
number bug.
* lisp/gnus/gnus-util.el (gnus-remassoc): Fixed typo in documentation.
* lisp/gnus/nnagent.el (nnagent-request-set-mark): Use
gnus-agent-synchronize-group-flags, not backend's request-set-mark
method, to ensure that synchronization updates marks in the
backend and in the info (in memory) structure.
2004-10-18 Kevin Greiner <kgreiner@compsol.cc>
* lisp/gnus/gnus-agent.el (gnus-agent-synchronize-flags-server): Do nothing
unless plugged. Disable the agent so that an open failure causes
an error.
2004-10-18 Kevin Greiner <kevin.greiner@compsol.cc> for Reiner Steib <Reiner.Steib@gmx.de>
* lisp/gnus/gnus-agent.el (gnus-agent-fetched-hook): Add :version.
(gnus-agent-go-online): Change :version.
(gnus-agent-expire-unagentized-dirs)
(gnus-agent-auto-agentize-methods): Add :version.
2004-10-18 Kevin Greiner <kgreiner@compsol.cc>
* lisp/gnus/legacy-gnus-agent.el (gnus-agent-convert-to-compressed-agentview-prompt):
New function. Used internally to only display 'gnus converting
files' message when actually necessary.
* lisp/gnus/gnus-sum.el (): Removed (require 'gnus-agent) as required
methods now autoloaded.
* lisp/gnus/gnus-int.el (gnus-request-move-article): Use
gnus-agent-unfetch-articles in place of gnus-agent-expire to
improve performance.
2004-10-18 Kevin Greiner <kgreiner@compsol.cc>
* lisp/gnus/gnus-agent.el (gnus-agent-cat-groups): rewrote avoiding defsetf
to avoid run-time CL dependencies.
(gnus-agent-unfetch-articles): New function.
(gnus-agent-fetch-headers): Use gnus-agent-braid-nov to validate
article numbers even when local .overview file is missing.
(gnus-agent-read-article-number): New function. Only accepts
27-bit article numbers.
(gnus-agent-copy-nov-line, gnus-agent-uncached-articles): Use
gnus-agent-read-article-number.
(gnus-agent-braid-nov): Rewrote to validate article numbers coming
from backend while recognizing that article numbers in .overview
must be valid.
* lisp/gnus/gnus-start.el (gnus-convert-old-newsrc): Changed message text as
some users confused by references to .newsrc when they only have a
.newsrc.eld file.
(gnus-convert-mark-converter-prompt,
gnus-convert-converter-needs-prompt): Fixed use of property list.
2004-10-18 Kevin Greiner <kevin.greiner@compsol.cc> for Katsumi Yamaoka <yamaoka@jpl.org>
* lisp/gnus/gnus-agent.el (gnus-agent-restore-gcc): Use ^ and regexp-quote.
2004-10-18 Kevin Greiner <kevin.greiner@compsol.cc> for Lars Magne Ingebrigtsen <larsi@gnus.org>
* lisp/gnus/gnus-start.el (gnus-get-unread-articles-in-group): Don't do
stuff for non-living groups.
2004-10-18 Kevin Greiner <kevin.greiner@compsol.cc> for Lars Magne Ingebrigtsen <larsi@gnus.org>
* lisp/gnus/gnus-agent.el (gnus-agent-synchronize-flags): Default to nil.
(gnus-agent-regenerate-group): Using nil messages aren't valid.
2004-10-18 Kevin Greiner <kevin.greiner@compsol.cc> for Lars Magne Ingebrigtsen <larsi@gnus.org>
* lisp/gnus/gnus-agent.el (gnus-agent-read-agentview): Inline
gnus-uncompress-range.
2004-10-18 Kevin Greiner <kgreiner@xpediantsolutions.com>
* lisp/gnus/legacy-gnus-agent.el
(gnus-agent-convert-to-compressed-agentview): Fixed typos with
help from Florian Weimer <fw@deneb.enyo.de>
* lisp/gnus/gnus-agent.el (gnus-agentize):
gnus-agent-send-mail-real-function no longer set to current value
of message-send-mail-function but rather a lambda that calls
message-send-mail-function. The change makes the agent real-time
responsive to user changes to message-send-mail-function.
2004-10-18 Kevin Greiner <kevin.greiner@compsol.cc> for Reiner Steib <Reiner.Steib@gmx.de>
* lisp/gnus/gnus-start.el (gnus-get-unread-articles): Fix last commit.
2004-10-18 Kevin Greiner <kgreiner@xpediantsolutions.com>
* lisp/gnus/gnus-cache.el (gnus-cache-rename-group): New function.
(gnus-cache-delete-group): New function.
* lisp/gnus/gnus-agent.el (gnus-agent-rename-group): New function.
(gnus-agent-delete-group): New function.
(gnus-agent-save-group-info): Use gnus-command-method when
`method' parameter is nil. Don't write nil entries into the
active file.
(gnus-agent-get-group-info): New function.
(gnus-agent-get-local): Added optional parameters to avoid calling
gnus-group-real-name and gnus-find-method-for-group.
(gnus-agent-set-local): Delete stored entry if either min, or max,
are nil.
(gnus-agent-fetch-session): Reworded error/quit messages. On
quit, use gnus-agent-regenerate-group to record existance of any
articles fetched to disk before the quit occurred.
* lisp/gnus/gnus-int.el (gnus-request-delete-group): Use
gnus-cache-delete-group and gnus-agent-delete-group to keep the
local disk in sync with the server.
(gnus-request-rename-group): Use
gnus-cache-rename-group and gnus-agent-rename-group to keep the
local disk in sync with the server.
* lisp/gnus/gnus-start.el (gnus-get-unread-articles): Cosmetic
simplification to logic.
* lisp/gnus/gnus-group.el (): (gnus-group-delete-group): No longer update
gnus-cache-active-altered as gnus-request-delete-group now keeps
the cache in sync.
(gnus-group-list-active): Let the agent store a server's active
list if currently plugged.
* lisp/gnus/gnus-util.el (gnus-rename-file): New function.
2004-10-18 Kevin Greiner <kevin.greiner@compsol.cc> for Katsumi Yamaoka <yamaoka@jpl.org>
* lisp/gnus/gnus-agent.el (gnus-agent-regenerate-group): Activate the group
when the group's active is not available.
2004-10-18 Kevin Greiner <kevin.greiner@compsol.cc> for Katsumi Yamaoka <yamaoka@jpl.org>
* lisp/gnus/gnus-agent.el (gnus-agent-read-agentview): Add a missing arg to
error.
2004-10-18 Kevin Greiner <kevin.greiner@compsol.cc>
* lisp/gnus/gnus-start.el (gnus-convert-old-newsrc): Only write the
conversion message to newsrc-dribble when an actual conversion is
performed.
2004-10-18 Kevin Greiner <kevin.greiner@compsol.cc>
* lisp/gnus/gnus-agent.el (gnus-agent-read-local): Bind
nnheader-file-coding-system to gnus-agent-file-coding-system to
avoid the implicit assumption that they will always be equal.
(gnus-agent-save-local): Bind buffer-file-coding-system, not
coding-system-for-write, as the with-temp-file macro first prints
to a buffer then saves the buffer.
2004-10-18 Kevin Greiner <kgreiner@xpediantsolutions.com>
* lisp/gnus/legacy-gnus-agent.el (): New. Provides converters that are only
loaded when gnus-convert-old-newsrc needs to call them.
* lisp/gnus/gnus-agent.el (gnus-agent-read-agentview): Removed support for
old file versions.
(gnus-group-prepare-hook): Removed function that converted list
form of gnus-agent-expire-days to group properties.
* lisp/gnus/gnus-start.el (gnus-convert-old-newsrc): Registered new
converters to handle old agent file formats. Added logic for a
"backup before upgrading warning".
(gnus-convert-mark-converter-prompt): Developers can mark
functions as needing (default), or not needing,
gnus-convert-old-newsrc's "backup before upgrading warning".
(gnus-convert-converter-needs-prompt): Tests whether the user
should be protected from potentially irreversable changes by the
function.
2004-10-18 Kevin Greiner <kgreiner@xpediantsolutions.com>
* lisp/gnus/gnus-int.el (gnus-request-accept-article): Inform the agent that
articles are being added to a group.
(gnus-request-replace-article): Inform the agent that articles
need to be uncached as the cached contents are no longer valid.
* lisp/gnus/gnus-agent.el (gnus-agent-file-header-cache): Removed.
(gnus-agent-possibly-alter-active): Avoid null in numeric
comparison.
(gnus-agent-set-local): Refuse to save null in local object table.
(gnus-agent-regenerate-group): The REREAD parameter can now be a
list of articles that will be marked as unread.
2004-10-18 Kevin Greiner <kevin.greiner@compsol.cc>
* lisp/gnus/gnus-range.el (gnus-sorted-range-intersection): Now accepts
single-interval range of the form (min . max). Previously the
range had to look like ((min . max)). Likewise, return
(min . max) rather than ((min . max)).
(gnus-range-map): Use gnus-range-normalize to accept
single-interval range.
* lisp/gnus/gnus-sum.el (gnus-summary-highlight-line): Articles stored in
the cache, but not the agent, now appear with their usual face.
2004-10-18 Kevin Greiner <kevin.greiner@compsol.cc>
* lisp/gnus/gnus-sum.el (gnus-adjust-marks): Now correctly handles a list of
marks consisting of a single range {for example, (3 . 5)} rather
than a list of a single range { ((3 . 5)) }.
2004-10-18 Kevin Greiner <kevin.greiner@compsol.cc>
* lisp/gnus/gnus-sum.el (gnus-adjust-marks): Avoid splicing null INTO the
uncompressed list.
2004-10-18 Kevin Greiner <kevin.greiner@compsol.cc>
* lisp/gnus/gnus-draft.el (gnus-group-send-queue): Pass the group name
"nndraft:queue" along to gnus-draft-send. Use
gnus-agent-prompt-send-queue.
(gnus-draft-send): Rebind gnus-agent-queue-mail to nil when group
is "nndraft:queue". Suggested by Gaute Strokkenes
<gs234@srcf.ucam.org>
* lisp/gnus/gnus-group.el (gnus-group-catchup): Use new
gnus-sequence-of-unread-articles, not
gnus-list-of-unread-articles, to avoid exhausting memory with huge
numbers of articles. Use gnus-range-map to avoid having to
uncompress the unread list.
(gnus-group-archive-directory,
gnus-group-recent-archive-directory): Fixed invalid ange-ftp
reference.
* lisp/gnus/gnus-range.el (gnus-range-map): Iterate over list or sequence.
(gnus-sorted-range-intersection): Intersection of two ranges
without requiring that they first be uncompressed.
* lisp/gnus/gnus-start.el (gnus-activate-group): Unless blocked by the
caller, possibly expand the active range to include both cached
and agentized articles.
(gnus-convert-old-newsrc): Rewrote in anticipation of having
multiple version-dependent converters.
(gnus-groups-to-gnus-format): Replaced gnus-agent-save-groups with
gnus-agent-save-active.
(gnus-save-newsrc-file): Save dirty agent range limits.
* lisp/gnus/gnus-sum.el (gnus-select-newgroup): Replaced inline code with
gnus-agent-possibly-alter-active.
(gnus-adjust-marked-articles): Faster handling of simple lists
2004-10-18 David Edmondson <dme@dme.org>
* lisp/gnus/mm-view.el (mm-w3m-cid-retrieve-1): Don't use recursive call
excessively.
2004-10-19 22:38:28 +00:00
|
|
|
(dolist (elem handle)
|
|
|
|
|
(when (listp elem)
|
|
|
|
|
(if (equal url (mm-handle-id elem))
|
|
|
|
|
(progn
|
|
|
|
|
(mm-insert-part elem)
|
|
|
|
|
(throw 'found-handle (mm-handle-media-type elem))))
|
|
|
|
|
(if (equal "multipart" (mm-handle-media-supertype elem))
|
|
|
|
|
(mm-w3m-cid-retrieve-1 url elem)))))
|
2004-09-04 13:13:48 +00:00
|
|
|
|
|
|
|
|
(defun mm-w3m-cid-retrieve (url &rest args)
|
|
|
|
|
"Insert a content pointed by URL if it has the cid: scheme."
|
|
|
|
|
(when (string-match "\\`cid:" url)
|
|
|
|
|
(catch 'found-handle
|
|
|
|
|
(mm-w3m-cid-retrieve-1 (concat "<" (substring url (match-end 0)) ">")
|
|
|
|
|
(with-current-buffer w3m-current-buffer
|
|
|
|
|
gnus-article-mime-handles)))))
|
|
|
|
|
|
|
|
|
|
(defun mm-inline-text-html-render-with-w3m (handle)
|
|
|
|
|
"Render a text/html part using emacs-w3m."
|
|
|
|
|
(mm-setup-w3m)
|
|
|
|
|
(let ((text (mm-get-part handle))
|
|
|
|
|
(b (point))
|
|
|
|
|
(charset (mail-content-type-get (mm-handle-type handle) 'charset)))
|
|
|
|
|
(save-excursion
|
|
|
|
|
(insert (if charset (mm-decode-string text charset) text))
|
|
|
|
|
(save-restriction
|
|
|
|
|
(narrow-to-region b (point))
|
|
|
|
|
(unless charset
|
|
|
|
|
(goto-char (point-min))
|
|
|
|
|
(when (setq charset (w3m-detect-meta-charset))
|
2000-09-19 13:40:08 +00:00
|
|
|
(delete-region (point-min) (point-max))
|
2004-09-04 13:13:48 +00:00
|
|
|
(insert (mm-decode-string text charset))))
|
|
|
|
|
(let ((w3m-safe-url-regexp mm-w3m-safe-url-regexp)
|
|
|
|
|
w3m-force-redisplay)
|
|
|
|
|
(w3m-region (point-min) (point-max) nil charset))
|
|
|
|
|
(when (and mm-inline-text-html-with-w3m-keymap
|
|
|
|
|
(boundp 'w3m-minor-mode-map)
|
|
|
|
|
w3m-minor-mode-map)
|
|
|
|
|
(add-text-properties
|
|
|
|
|
(point-min) (point-max)
|
|
|
|
|
(list 'keymap w3m-minor-mode-map
|
|
|
|
|
;; Put the mark meaning this part was rendered by emacs-w3m.
|
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-668
Merge from gnus--rel--5.10
Patches applied:
* gnus--rel--5.10 (patch 157-168)
- Merge from emacs--cvs-trunk--0
- Update from CVS
- Update from CVS: texi/message.texi: Fix default values.
2005-12-08 Reiner Steib <Reiner.Steib@gmx.de>
* lisp/gnus/mm-decode.el (mm-discouraged-alternatives): Fix custom type.
Suggest image/.* in the doc string.
2005-12-07 Katsumi Yamaoka <yamaoka@jpl.org>
* lisp/gnus/mm-decode.el (mm-display-external): Use nametemplate (defined in
RFC1524) if it is in mailcap or add a suffix according to
mailcap-mime-extensions when generating a temp filename; postpone
deleting a temp file for 2 seconds for some wrappers, shell
scripts, and so on, which might exit right after having started a
viewer command as a background job.
2005-12-06 Reiner Steib <Reiner.Steib@gmx.de>
* lisp/gnus/gnus-art.el (gnus-default-article-saver): Add user-defined
`function' to custom type.
2005-12-02 ARISAWA Akihiro <ari@mbf.ocn.ne.jp> (tiny change)
* lisp/gnus/mm-view.el (mm-inline-text-html-render-with-w3m): Fix misplaced
parens.
2005-11-29 Reiner Steib <Reiner.Steib@gmx.de>
* lisp/gnus/gnus-cache.el (gnus-cache-rename-group): Wrap doc strings and
long lines.
(gnus-cache-delete-group): Wrap doc strings.
* lisp/gnus/gnus-agent.el (gnus-agent-rename-group)
(gnus-agent-delete-group): Wrap doc strings.
2005-11-24 Pascal Rigaux <pixel@mandriva.com> (tiny change)
* lisp/gnus/rfc2231.el (rfc2231-parse-string): Support non-ascii chars.
2005-11-22 Katsumi Yamaoka <yamaoka@jpl.org>
* lisp/gnus/nnmail.el (nnmail-fancy-expiry-target): Use current-time instead
of current-time-string.
2005-11-20 Stefan Schimanski <schimmi@debian.org> (tiny change)
* lisp/gnus/nnmail.el (nnmail-fancy-expiry-target): Protect against invalid
date header.
2005-11-16 Boris Samorodov <bsam@ipt.ru> (tiny patch)
* lisp/gnus/imap.el (imap-kerberos4-open): Ignore SSL stuff.
2005-11-14 Kevin Greiner <kevin.greiner@compsol.cc>
* lisp/gnus/gnus-agent.el (gnus-agent-article-alist-save-format): Changed
internal variable to a custom variable. Changed default value
from compressed(2) to uncompressed(1).
(gnus-agent-read-agentview): Reversed revision 7.8 to restore
support for uncompressed agentview files. Taken together, reading
the agentview file should now be 6-7 times faster.
(gnus-agent-long-article,
gnus-agent-short-article, gnus-agent-score): Renamed category
keywords to match gnus-cus.
(gnus-agent-summary-fetch-series): Modified to protect against
gnus-agent-summary-fetch-group clearing processable flags.
(gnus-agent-synchronize-group-flags): Update live group buffer as
synchronization may occur due to the user toggling the plugged
status.
(gnus-agent-braid-nov): Now tests new nov entries
for duplicates which are removed. The invalid sort check then
triggers a rescan after the sort as sorting may have moved
duplicate entries such that they can be cheaply detected.
(gnus-agent-read-local): Trivial fix to format of
error message to display actual error condition.
(gnus-agent-save-local): Avoid saving symbols that are bound to
nil as they simply result in a warning message in
gnus-agent-read-local.
(gnus-agent-fetch-group-1): Clear downloadable flag when article
successfully downloaded.
(gnus-agent-regenerate-group): Use
gnus-agent-synchronize-group-flags to reset read status in both
gnus and server.
* lisp/gnus/nntp.el (nntp-end-of-line): Doc fix.
(nntp-authinfo-rejected): New error condition.
(nntp-wait-for): Use new error condition to signal authentication
error.
(nntp-retrieve-data): Rethrow new error condition to break out of
recursive call to nntp-send-authinfo.
2005-11-13 Katsumi Yamaoka <yamaoka@jpl.org>
* lisp/gnus/gnus-start.el (gnus-dribble-read-file): Use make-local-variable
rather than make-variable-buffer-local for file-precious-flag.
2005-11-13 Katsumi Yamaoka <yamaoka@jpl.org>
* lisp/gnus/gnus-start.el (gnus-dribble-read-file): Quote file-precious-flag.
2005-11-11 Jan Nieuwenhuizen <janneke@gnu.org>
* lisp/gnus/gnus-start.el (gnus-dribble-read-file): Set file-precious-flag,
as a buffer-local variable. This avoids creating truncated
dribble files as a result of a hang up, eg.
2005-11-04 Ken Manheimer <ken.manheimer@gmail.com>
* lisp/gnus/pgg-pgp.el (pgg-pgp-encrypt-region, pgg-pgp-decrypt-region)
(pgg-pgp-encrypt-symmetric-region, pgg-pgp-encrypt-symmetric)
(pgg-pgp-encrypt, pgg-pgp-decrypt-region, pgg-pgp-decrypt)
(pgg-pgp-sign-region, pgg-pgp-sign): Add optional 'passphrase'
argument to all these routines, so the passphrase can be managed
externally and passed in to the system.
(pgg-pgp-decrypt-region, pgg-pgp-sign-region): Use new name for
pgg-add-passphrase-to-cache function.
* lisp/gnus/pgg-pgp5.el (pgg-pgp5-encrypt-region, pgg-pgp5-decrypt-region)
(pgg-pgp5-encrypt-symmetric-region, pgg-pgp5-encrypt-symmetric)
(pgg-pgp5-encrypt, pgg-pgp5-decrypt-region, pgg-pgp5-decrypt)
(pgg-pgp5-sign-region, pgg-pgp5-sign): Add optional 'passphrase'
argument to all these routines, so the passphrase can be managed
externally and passed in to the system.
(pgg-pgp5-sign-region): Use new name of pgg-add-passphrase-to-cache
function.
2005-10-30 Chong Yidong <cyd@stupidchicken.com>
* lisp/gnus/imap.el (imap-open): Handle case where buffer is a buffer
object.
2005-10-29 Ken Manheimer <ken.manheimer@gmail.com>
* lisp/gnus/pgg-gpg.el (pgg-gpg-select-matching-key): Fix: look at the right
part of the decoded armor to find the key-identifier.
(pgg-gpg-lookup-key-owner): New function to return the
human-readable identifier of a key owner.
(pgg-gpg-lookup-id-from-key-owner): Make it easy to identify the
key itself.
(pgg-gpg-decrypt-region): Prompt with the key owner (rather than
the key value) if we have a key and can match it against a secret
key. Also, added a note pointing out fact that the prompt only
indicates the first matching key.
* lisp/gnus/pgg.el (pgg-decrypt): Passing along 'passphrase' in call to
pgg-decrypt-region.
(pgg-pending-timers): A new hash for tracking the passphrase cache
timers, so that new ones supercede old ones.
(pgg-add-passphrase-to-cache): Rename from
`pgg-add-passphrase-cache' to reduce confusion (all callers
changed). Modified to cancel old timers when new ones are added.
(pgg-remove-passphrase-from-cache): Rename from
`pgg-remove-passphrase-cache' to reduce confusion (all callers
changed). Modified to cancel old timers when their keys are
removed from the cache.
(pgg-cancel-timer): In Emacs, an alias for cancel-timer; in
XEmacs, an indirection to delete-itimer.
(pgg-read-passphrase-from-cache, pgg-read-passphrase):
Extract pgg-read-passphrase-from-cache from pgg-read-passphrase so
users can only check cache without risk of prompting. Correct bug in
notruncate behavior.
(pgg-read-passphrase-from-cache, pgg-read-passphrase)
(pgg-add-passphrase-cache, pgg-remove-passphrase-cache):
Add informative docstrings.
(pgg-decrypt): Convey provided passphrase in subordinate call to
pgg-decrypt-region.
2005-10-20 Ken Manheimer <ken.manheimer+emacs@gmail.com>
* lisp/gnus/pgg.el (pgg-encrypt-region, pgg-encrypt-symmetric-region)
(pgg-encrypt-symmetric, pgg-encrypt, pgg-decrypt-region)
(pgg-decrypt, pgg-sign-region, pgg-sign): Add optional
'passphrase' argument, so the passphrase can be managed externally
and then passed in to the system.
* lisp/gnus/pgg.el (pgg-read-passphrase, pgg-add-passphrase-cache)
(pgg-remove-passphrase-cache): Add optional 'notruncate' argument,
so the passphrase cache can be used reliably with identifiers
besides a pgp packet's key id.
* lisp/gnus/pgg-gpg.el (pgg-pgp-encrypt-region)
(pgg-pgp-encrypt-symmetric-region, pgg-pgp-encrypt-symmetric)
(pgg-pgp-encrypt, pgg-pgp-decrypt-region, pgg-pgp-decrypt)
(pgg-pgp-sign-region, pgg-pgp-sign): Add optional 'passphrase'
argument to all these routines, so the passphrase can be managed
externally and passed in to the system.
* lisp/gnus/pgg-gpg.el (pgg-gpg-possibly-cache-passphrase): Add optional
'notruncate' argument, so the passphrase cache can be used
reliably with identifiers besides a pgp packet's key id.
2005-10-29 Sascha Wilde <swilde@sha-bang.de>
* lisp/gnus/pgg-gpg.el (pgg-gpg-encrypt-symmetric-region): New function for
symmetric encryption.
(pgg-gpg-symmetric-key-p): New function to check for an symmetric
encrypted session key.
(pgg-gpg-decrypt-region): When decrypting a symmetric encrypted
message ask for the passphrase in a proper way.
* lisp/gnus/pgg.el (pgg-encrypt-symmetric, pgg-encrypt-symmetric-region):
New user commands for symmetric encryption.
2005-12-05 Katsumi Yamaoka <yamaoka@jpl.org>
* man/pgg.texi (User Commands): Fix description of pgg-verify-region.
(Selecting an implementation): Fix descriptions.
2005-11-30 Katsumi Yamaoka <yamaoka@jpl.org>
* man/message.texi (Various Message Variables): Addition.
2005-11-29 Katsumi Yamaoka <yamaoka@jpl.org>
* man/message.texi: Fix default values.
2005-11-25 Katsumi Yamaoka <yamaoka@jpl.org>
* man/message.texi (Header Commands): Clarify descriptions of
message-cross-post-followup-to, message-reduce-to-to-cc, and
message-insert-wide-reply.
(Various Commands): Fix kindex for message-kill-to-signature;
clarify description of message-tab.
2005-11-22 Katsumi Yamaoka <yamaoka@jpl.org>
* man/message.texi (Mailing Lists): Fix description about MFT.
* man/gnus.texi (Emacs Lisp): Use ~/.gnus.el instead of ~/.emacs.
2005-11-17 Katsumi Yamaoka <yamaoka@jpl.org>
* man/gnus.texi (Slow Terminal Connection): Replace old description
with new one.
2005-11-16 Katsumi Yamaoka <yamaoka@jpl.org>
* man/gnus.texi (Oort Gnus): Use ~/.gnus.el instead of ~/.emacs;
replace X-Draft-Headers with X-Draft-From.
2005-11-14 Katsumi Yamaoka <yamaoka@jpl.org>
* man/gnus.texi (Various Various): Fix the default value of
nnheader-max-head-length.
(Gnus Versions): Fix typo.
2005-12-09 08:57:58 +00:00
|
|
|
'mm-inline-text-html-with-w3m t)))
|
|
|
|
|
(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)))))))))
|
2004-09-04 13:13:48 +00:00
|
|
|
|
2006-01-25 06:47:24 +00:00
|
|
|
(defvar mm-w3m-standalone-supports-m17n-p (if (featurep 'mule) 'undecided)
|
|
|
|
|
"*T means the w3m command supports the m17n feature.")
|
|
|
|
|
|
|
|
|
|
(defun mm-w3m-standalone-supports-m17n-p ()
|
|
|
|
|
"Say whether the w3m command supports the m17n feature."
|
|
|
|
|
(cond ((eq mm-w3m-standalone-supports-m17n-p t) t)
|
|
|
|
|
((eq mm-w3m-standalone-supports-m17n-p nil) nil)
|
|
|
|
|
((not (featurep 'mule)) (setq mm-w3m-standalone-supports-m17n-p nil))
|
|
|
|
|
((condition-case nil
|
|
|
|
|
(let ((coding-system-for-write 'iso-2022-jp)
|
|
|
|
|
(coding-system-for-read 'iso-2022-jp)
|
|
|
|
|
(str (mm-decode-coding-string "\
|
|
|
|
|
\e$B#D#o#e#s!!#w#3#m!!#s#u#p#p#o#r#t#s!!#m#1#7#n!)\e(B" 'iso-2022-jp)))
|
|
|
|
|
(mm-with-multibyte-buffer
|
|
|
|
|
(insert str)
|
|
|
|
|
(call-process-region
|
|
|
|
|
(point-min) (point-max) "w3m" t t nil "-dump"
|
|
|
|
|
"-T" "text/html" "-I" "iso-2022-jp" "-O" "iso-2022-jp")
|
|
|
|
|
(goto-char (point-min))
|
|
|
|
|
(search-forward str nil t)))
|
|
|
|
|
(error nil))
|
|
|
|
|
(setq mm-w3m-standalone-supports-m17n-p t))
|
|
|
|
|
(t
|
|
|
|
|
;;(message "You had better upgrade your w3m command")
|
|
|
|
|
(setq mm-w3m-standalone-supports-m17n-p nil))))
|
|
|
|
|
|
2006-01-16 09:27:43 +00:00
|
|
|
(defun mm-inline-text-html-render-with-w3m-standalone (handle)
|
|
|
|
|
"Render a text/html part using w3m."
|
2006-01-25 06:47:24 +00:00
|
|
|
(if (mm-w3m-standalone-supports-m17n-p)
|
|
|
|
|
(let ((source (mm-get-part handle))
|
|
|
|
|
(charset (mail-content-type-get (mm-handle-type handle) 'charset))
|
|
|
|
|
cs)
|
|
|
|
|
(unless (and charset
|
|
|
|
|
(setq cs (mm-charset-to-coding-system charset))
|
|
|
|
|
(not (eq cs 'ascii)))
|
|
|
|
|
;; The default.
|
|
|
|
|
(setq charset "iso-8859-1"
|
|
|
|
|
cs 'iso-8859-1))
|
|
|
|
|
(mm-insert-inline
|
|
|
|
|
handle
|
|
|
|
|
(mm-with-unibyte-buffer
|
|
|
|
|
(insert source)
|
|
|
|
|
(mm-enable-multibyte)
|
|
|
|
|
(let ((coding-system-for-write 'binary)
|
|
|
|
|
(coding-system-for-read cs))
|
|
|
|
|
(call-process-region
|
|
|
|
|
(point-min) (point-max)
|
|
|
|
|
"w3m" t t nil "-dump" "-T" "text/html"
|
|
|
|
|
"-I" charset "-O" charset))
|
|
|
|
|
(buffer-string))))
|
|
|
|
|
(mm-inline-render-with-stdin handle nil "w3m" "-dump" "-T" "text/html")))
|
2006-01-16 09:27:43 +00:00
|
|
|
|
2004-09-04 13:13:48 +00:00
|
|
|
(defun mm-links-remove-leading-blank ()
|
|
|
|
|
;; Delete the annoying three spaces preceding each line of links
|
|
|
|
|
;; output.
|
|
|
|
|
(goto-char (point-min))
|
|
|
|
|
(while (re-search-forward "^ " nil t)
|
|
|
|
|
(delete-region (match-beginning 0) (match-end 0))))
|
|
|
|
|
|
|
|
|
|
(defun mm-inline-wash-with-file (post-func cmd &rest args)
|
|
|
|
|
(let ((file (mm-make-temp-file
|
|
|
|
|
(expand-file-name "mm" mm-tmp-directory))))
|
|
|
|
|
(let ((coding-system-for-write 'binary))
|
|
|
|
|
(write-region (point-min) (point-max) file nil 'silent))
|
|
|
|
|
(delete-region (point-min) (point-max))
|
|
|
|
|
(unwind-protect
|
|
|
|
|
(apply 'call-process cmd nil t nil (mapcar 'eval args))
|
|
|
|
|
(delete-file file))
|
|
|
|
|
(and post-func (funcall post-func))))
|
|
|
|
|
|
|
|
|
|
(defun mm-inline-wash-with-stdin (post-func cmd &rest args)
|
|
|
|
|
(let ((coding-system-for-write 'binary))
|
|
|
|
|
(apply 'call-process-region (point-min) (point-max)
|
|
|
|
|
cmd t t nil args))
|
|
|
|
|
(and post-func (funcall post-func)))
|
|
|
|
|
|
|
|
|
|
(defun mm-inline-render-with-file (handle post-func cmd &rest args)
|
|
|
|
|
(let ((source (mm-get-part handle)))
|
|
|
|
|
(mm-insert-inline
|
|
|
|
|
handle
|
|
|
|
|
(mm-with-unibyte-buffer
|
|
|
|
|
(insert source)
|
|
|
|
|
(apply 'mm-inline-wash-with-file post-func cmd args)
|
|
|
|
|
(buffer-string)))))
|
|
|
|
|
|
|
|
|
|
(defun mm-inline-render-with-stdin (handle post-func cmd &rest args)
|
|
|
|
|
(let ((source (mm-get-part handle)))
|
|
|
|
|
(mm-insert-inline
|
|
|
|
|
handle
|
|
|
|
|
(mm-with-unibyte-buffer
|
|
|
|
|
(insert source)
|
|
|
|
|
(apply 'mm-inline-wash-with-stdin post-func cmd args)
|
|
|
|
|
(buffer-string)))))
|
|
|
|
|
|
|
|
|
|
(defun mm-inline-render-with-function (handle func &rest args)
|
|
|
|
|
(let ((source (mm-get-part handle))
|
|
|
|
|
(charset (mail-content-type-get (mm-handle-type handle) 'charset)))
|
|
|
|
|
(mm-insert-inline
|
|
|
|
|
handle
|
|
|
|
|
(mm-with-multibyte-buffer
|
|
|
|
|
(insert (if charset
|
|
|
|
|
(mm-decode-string source charset)
|
|
|
|
|
source))
|
|
|
|
|
(apply func args)
|
|
|
|
|
(buffer-string)))))
|
|
|
|
|
|
|
|
|
|
(defun mm-inline-text-html (handle)
|
|
|
|
|
(let* ((func (or mm-inline-text-html-renderer mm-text-html-renderer))
|
|
|
|
|
(entry (assq func mm-text-html-renderer-alist))
|
|
|
|
|
buffer-read-only)
|
|
|
|
|
(if entry
|
|
|
|
|
(setq func (cdr entry)))
|
|
|
|
|
(cond
|
|
|
|
|
((functionp func)
|
|
|
|
|
(funcall func handle))
|
2000-09-19 13:40:08 +00:00
|
|
|
(t
|
2004-09-04 13:13:48 +00:00
|
|
|
(apply (car func) handle (cdr func))))))
|
|
|
|
|
|
|
|
|
|
(defun mm-inline-text-vcard (handle)
|
|
|
|
|
(let (buffer-read-only)
|
|
|
|
|
(mm-insert-inline
|
|
|
|
|
handle
|
|
|
|
|
(concat "\n-- \n"
|
|
|
|
|
(ignore-errors
|
|
|
|
|
(if (fboundp 'vcard-pretty-print)
|
|
|
|
|
(vcard-pretty-print (mm-get-part handle))
|
|
|
|
|
(vcard-format-string
|
|
|
|
|
(vcard-parse-string (mm-get-part handle)
|
|
|
|
|
'vcard-standard-filter))))))))
|
|
|
|
|
|
|
|
|
|
(defun mm-inline-text (handle)
|
|
|
|
|
(let ((b (point))
|
|
|
|
|
(type (mm-handle-media-subtype handle))
|
|
|
|
|
(charset (mail-content-type-get
|
|
|
|
|
(mm-handle-type handle) 'charset))
|
|
|
|
|
buffer-read-only)
|
|
|
|
|
(if (or (eq charset 'gnus-decoded)
|
|
|
|
|
;; This is probably not entirely correct, but
|
|
|
|
|
;; makes rfc822 parts with embedded multiparts work.
|
|
|
|
|
(eq mail-parse-charset 'gnus-decoded))
|
2000-09-19 13:40:08 +00:00
|
|
|
(save-restriction
|
2004-09-04 13:13:48 +00:00
|
|
|
(narrow-to-region (point) (point))
|
|
|
|
|
(mm-insert-part handle)
|
|
|
|
|
(goto-char (point-max)))
|
|
|
|
|
(insert (mm-decode-string (mm-get-part handle) charset)))
|
2006-02-24 05:02:12 +00:00
|
|
|
(when (and mm-fill-flowed
|
|
|
|
|
(equal type "plain")
|
2004-09-04 13:13:48 +00:00
|
|
|
(equal (cdr (assoc 'format (mm-handle-type handle)))
|
|
|
|
|
"flowed"))
|
|
|
|
|
(save-restriction
|
|
|
|
|
(narrow-to-region b (point))
|
|
|
|
|
(goto-char b)
|
|
|
|
|
(fill-flowed)
|
|
|
|
|
(goto-char (point-max))))
|
|
|
|
|
(save-restriction
|
|
|
|
|
(narrow-to-region b (point))
|
|
|
|
|
(when (or (equal type "enriched")
|
|
|
|
|
(equal type "richtext"))
|
2005-09-28 05:26:02 +00:00
|
|
|
(set-text-properties (point-min) (point-max) nil)
|
2004-09-04 13:13:48 +00:00
|
|
|
(ignore-errors
|
|
|
|
|
(enriched-decode (point-min) (point-max))))
|
|
|
|
|
(mm-handle-set-undisplayer
|
|
|
|
|
handle
|
|
|
|
|
`(lambda ()
|
|
|
|
|
(let (buffer-read-only)
|
|
|
|
|
(delete-region ,(point-min-marker)
|
|
|
|
|
,(point-max-marker))))))))
|
2000-09-19 13:40:08 +00:00
|
|
|
|
|
|
|
|
(defun mm-insert-inline (handle text)
|
|
|
|
|
"Insert TEXT inline from HANDLE."
|
2004-09-04 13:13:48 +00:00
|
|
|
(let ((b (point)))
|
2000-09-19 13:40:08 +00:00
|
|
|
(insert text)
|
|
|
|
|
(mm-handle-set-undisplayer
|
|
|
|
|
handle
|
|
|
|
|
`(lambda ()
|
|
|
|
|
(let (buffer-read-only)
|
|
|
|
|
(delete-region ,(set-marker (make-marker) b)
|
|
|
|
|
,(set-marker (make-marker) (point))))))))
|
|
|
|
|
|
|
|
|
|
(defun mm-inline-audio (handle)
|
|
|
|
|
(message "Not implemented"))
|
|
|
|
|
|
|
|
|
|
(defun mm-view-sound-file ()
|
|
|
|
|
(message "Not implemented"))
|
|
|
|
|
|
|
|
|
|
(defun mm-w3-prepare-buffer ()
|
|
|
|
|
(require 'w3)
|
2002-02-07 15:57:55 +00:00
|
|
|
(let ((url-standalone-mode t)
|
2004-09-04 13:13:48 +00:00
|
|
|
(url-gateway-unplugged t)
|
|
|
|
|
(w3-honor-stylesheets nil))
|
2000-09-19 13:40:08 +00:00
|
|
|
(w3-prepare-buffer)))
|
|
|
|
|
|
|
|
|
|
(defun mm-view-message ()
|
|
|
|
|
(mm-enable-multibyte)
|
|
|
|
|
(let (handles)
|
|
|
|
|
(let (gnus-article-mime-handles)
|
|
|
|
|
;; Double decode problem may happen. See mm-inline-message.
|
|
|
|
|
(run-hooks 'gnus-article-decode-hook)
|
|
|
|
|
(gnus-article-prepare-display)
|
|
|
|
|
(setq handles gnus-article-mime-handles))
|
|
|
|
|
(when handles
|
|
|
|
|
(setq gnus-article-mime-handles
|
2004-09-04 13:13:48 +00:00
|
|
|
(mm-merge-handles gnus-article-mime-handles handles))))
|
2000-09-19 13:40:08 +00:00
|
|
|
(fundamental-mode)
|
|
|
|
|
(goto-char (point-min)))
|
|
|
|
|
|
|
|
|
|
(defun mm-inline-message (handle)
|
|
|
|
|
(let ((b (point))
|
2001-12-05 19:27:45 +00:00
|
|
|
(bolp (bolp))
|
2000-09-19 13:40:08 +00:00
|
|
|
(charset (mail-content-type-get
|
|
|
|
|
(mm-handle-type handle) 'charset))
|
|
|
|
|
gnus-displaying-mime handles)
|
|
|
|
|
(when (and charset
|
|
|
|
|
(stringp charset))
|
|
|
|
|
(setq charset (intern (downcase charset)))
|
|
|
|
|
(when (eq charset 'us-ascii)
|
|
|
|
|
(setq charset nil)))
|
|
|
|
|
(save-excursion
|
|
|
|
|
(save-restriction
|
|
|
|
|
(narrow-to-region b b)
|
|
|
|
|
(mm-insert-part handle)
|
|
|
|
|
(let (gnus-article-mime-handles
|
2001-12-05 19:27:45 +00:00
|
|
|
;; disable prepare hook
|
|
|
|
|
gnus-article-prepare-hook
|
2000-09-19 13:40:08 +00:00
|
|
|
(gnus-newsgroup-charset
|
2006-02-10 05:08:29 +00:00
|
|
|
(unless (eq charset 'gnus-decoded) ;; mm-uu might set it.
|
|
|
|
|
(or charset gnus-newsgroup-charset))))
|
2004-09-04 13:13:48 +00:00
|
|
|
(let ((gnus-original-article-buffer (mm-handle-buffer handle)))
|
|
|
|
|
(run-hooks 'gnus-article-decode-hook))
|
2000-09-19 13:40:08 +00:00
|
|
|
(gnus-article-prepare-display)
|
|
|
|
|
(setq handles gnus-article-mime-handles))
|
2001-12-05 19:27:45 +00:00
|
|
|
(goto-char (point-min))
|
|
|
|
|
(unless bolp
|
|
|
|
|
(insert "\n"))
|
2000-09-19 13:40:08 +00:00
|
|
|
(goto-char (point-max))
|
|
|
|
|
(unless (bolp)
|
|
|
|
|
(insert "\n"))
|
|
|
|
|
(insert "----------\n\n")
|
|
|
|
|
(when handles
|
|
|
|
|
(setq gnus-article-mime-handles
|
2004-09-04 13:13:48 +00:00
|
|
|
(mm-merge-handles gnus-article-mime-handles handles)))
|
2000-09-19 13:40:08 +00:00
|
|
|
(mm-handle-set-undisplayer
|
|
|
|
|
handle
|
|
|
|
|
`(lambda ()
|
|
|
|
|
(let (buffer-read-only)
|
2000-11-08 23:53:59 +00:00
|
|
|
(if (fboundp 'remove-specifier)
|
2000-09-19 13:40:08 +00:00
|
|
|
;; This is only valid on XEmacs.
|
|
|
|
|
(mapcar (lambda (prop)
|
|
|
|
|
(remove-specifier
|
|
|
|
|
(face-property 'default prop) (current-buffer)))
|
2000-11-08 23:53:59 +00:00
|
|
|
'(background background-pixmap foreground)))
|
2000-09-19 13:40:08 +00:00
|
|
|
(delete-region ,(point-min-marker) ,(point-max-marker)))))))))
|
|
|
|
|
|
2000-09-20 11:46:48 +00:00
|
|
|
(defun mm-display-inline-fontify (handle mode)
|
2000-09-19 13:40:08 +00:00
|
|
|
(let (text)
|
2004-09-04 13:13:48 +00:00
|
|
|
;; XEmacs @#$@ version of font-lock refuses to fully turn itself
|
|
|
|
|
;; on for buffers whose name begins with " ". That's why we use
|
|
|
|
|
;; save-current-buffer/get-buffer-create rather than
|
|
|
|
|
;; with-temp-buffer.
|
|
|
|
|
(save-current-buffer
|
|
|
|
|
(set-buffer (generate-new-buffer "*fontification*"))
|
|
|
|
|
(unwind-protect
|
|
|
|
|
(progn
|
|
|
|
|
(buffer-disable-undo)
|
|
|
|
|
(mm-insert-part handle)
|
|
|
|
|
(require 'font-lock)
|
2005-09-09 01:47:33 +00:00
|
|
|
(let ((font-lock-maximum-size nil)
|
|
|
|
|
;; Disable support modes, e.g., jit-lock, lazy-lock, etc.
|
|
|
|
|
(font-lock-mode-hook nil)
|
|
|
|
|
(font-lock-support-mode nil)
|
|
|
|
|
;; I find font-lock a bit too verbose.
|
|
|
|
|
(font-lock-verbose nil))
|
|
|
|
|
(funcall mode)
|
|
|
|
|
;; The mode function might have already turned on font-lock.
|
|
|
|
|
(unless (symbol-value 'font-lock-mode)
|
|
|
|
|
(font-lock-fontify-buffer)))
|
2004-09-04 13:13:48 +00:00
|
|
|
;; By default, XEmacs font-lock uses non-duplicable text
|
|
|
|
|
;; properties. This code forces all the text properties
|
|
|
|
|
;; to be copied along with the text.
|
|
|
|
|
(when (fboundp 'extent-list)
|
|
|
|
|
(map-extents (lambda (ext ignored)
|
|
|
|
|
(set-extent-property ext 'duplicable t)
|
|
|
|
|
nil)
|
|
|
|
|
nil nil nil nil nil 'text-prop))
|
|
|
|
|
(setq text (buffer-string)))
|
|
|
|
|
(kill-buffer (current-buffer))))
|
2000-09-19 13:40:08 +00:00
|
|
|
(mm-insert-inline handle text)))
|
|
|
|
|
|
2004-09-04 13:13:48 +00:00
|
|
|
;; Shouldn't these functions check whether the user even wants to use
|
|
|
|
|
;; font-lock? At least under XEmacs, this fontification is pretty
|
|
|
|
|
;; much unconditional. Also, it would be nice to change for the size
|
|
|
|
|
;; of the fontified region.
|
|
|
|
|
|
2000-09-20 11:46:48 +00:00
|
|
|
(defun mm-display-patch-inline (handle)
|
|
|
|
|
(mm-display-inline-fontify handle 'diff-mode))
|
|
|
|
|
|
|
|
|
|
(defun mm-display-elisp-inline (handle)
|
|
|
|
|
(mm-display-inline-fontify handle 'emacs-lisp-mode))
|
|
|
|
|
|
2004-09-04 13:13:48 +00:00
|
|
|
;; id-signedData OBJECT IDENTIFIER ::= { iso(1) member-body(2)
|
|
|
|
|
;; us(840) rsadsi(113549) pkcs(1) pkcs7(7) 2 }
|
|
|
|
|
(defvar mm-pkcs7-signed-magic
|
|
|
|
|
(mm-string-as-unibyte
|
|
|
|
|
(apply 'concat
|
|
|
|
|
(mapcar 'char-to-string
|
|
|
|
|
(list ?\x30 ?\x5c ?\x28 ?\x80 ?\x5c ?\x7c ?\x81 ?\x2e ?\x5c
|
|
|
|
|
?\x7c ?\x82 ?\x2e ?\x2e ?\x5c ?\x7c ?\x83 ?\x2e ?\x2e
|
|
|
|
|
?\x2e ?\x5c ?\x29 ?\x06 ?\x09 ?\x5c ?\x2a ?\x86 ?\x48
|
|
|
|
|
?\x86 ?\xf7 ?\x0d ?\x01 ?\x07 ?\x02)))))
|
|
|
|
|
|
|
|
|
|
;; id-envelopedData OBJECT IDENTIFIER ::= { iso(1) member-body(2)
|
|
|
|
|
;; us(840) rsadsi(113549) pkcs(1) pkcs7(7) 3 }
|
|
|
|
|
(defvar mm-pkcs7-enveloped-magic
|
|
|
|
|
(mm-string-as-unibyte
|
|
|
|
|
(apply 'concat
|
|
|
|
|
(mapcar 'char-to-string
|
|
|
|
|
(list ?\x30 ?\x5c ?\x28 ?\x80 ?\x5c ?\x7c ?\x81 ?\x2e ?\x5c
|
|
|
|
|
?\x7c ?\x82 ?\x2e ?\x2e ?\x5c ?\x7c ?\x83 ?\x2e ?\x2e
|
|
|
|
|
?\x2e ?\x5c ?\x29 ?\x06 ?\x09 ?\x5c ?\x2a ?\x86 ?\x48
|
|
|
|
|
?\x86 ?\xf7 ?\x0d ?\x01 ?\x07 ?\x03)))))
|
|
|
|
|
|
|
|
|
|
(defun mm-view-pkcs7-get-type (handle)
|
|
|
|
|
(mm-with-unibyte-buffer
|
|
|
|
|
(mm-insert-part handle)
|
|
|
|
|
(cond ((looking-at mm-pkcs7-enveloped-magic)
|
|
|
|
|
'enveloped)
|
|
|
|
|
((looking-at mm-pkcs7-signed-magic)
|
|
|
|
|
'signed)
|
|
|
|
|
(t
|
|
|
|
|
(error "Could not identify PKCS#7 type")))))
|
|
|
|
|
|
|
|
|
|
(defun mm-view-pkcs7 (handle)
|
|
|
|
|
(case (mm-view-pkcs7-get-type handle)
|
|
|
|
|
(enveloped (mm-view-pkcs7-decrypt handle))
|
|
|
|
|
(signed (mm-view-pkcs7-verify handle))
|
|
|
|
|
(otherwise (error "Unknown or unimplemented PKCS#7 type"))))
|
|
|
|
|
|
|
|
|
|
(defun mm-view-pkcs7-verify (handle)
|
|
|
|
|
;; A bogus implementation of PKCS#7. FIXME::
|
|
|
|
|
(mm-insert-part handle)
|
|
|
|
|
(goto-char (point-min))
|
|
|
|
|
(if (search-forward "Content-Type: " nil t)
|
|
|
|
|
(delete-region (point-min) (match-beginning 0)))
|
|
|
|
|
(goto-char (point-max))
|
|
|
|
|
(if (re-search-backward "--\r?\n?" nil t)
|
|
|
|
|
(delete-region (match-end 0) (point-max)))
|
|
|
|
|
(goto-char (point-min))
|
|
|
|
|
(while (search-forward "\r\n" nil t)
|
|
|
|
|
(replace-match "\n"))
|
|
|
|
|
(message "Verify signed PKCS#7 message is unimplemented.")
|
|
|
|
|
(sit-for 1)
|
|
|
|
|
t)
|
|
|
|
|
|
|
|
|
|
(autoload 'gnus-completing-read-maybe-default "gnus-util" nil nil 'macro)
|
|
|
|
|
|
|
|
|
|
(defun mm-view-pkcs7-decrypt (handle)
|
|
|
|
|
(insert-buffer-substring (mm-handle-buffer handle))
|
|
|
|
|
(goto-char (point-min))
|
|
|
|
|
(insert "MIME-Version: 1.0\n")
|
|
|
|
|
(mm-insert-headers "application/pkcs7-mime" "base64" "smime.p7m")
|
|
|
|
|
(smime-decrypt-region
|
|
|
|
|
(point-min) (point-max)
|
|
|
|
|
(if (= (length smime-keys) 1)
|
|
|
|
|
(cadar smime-keys)
|
|
|
|
|
(smime-get-key-by-email
|
|
|
|
|
(gnus-completing-read-maybe-default
|
2005-09-24 13:46:20 +00:00
|
|
|
(concat "Decipher using key"
|
|
|
|
|
(if smime-keys
|
|
|
|
|
(concat " (default " (caar smime-keys) "): ")
|
|
|
|
|
": "))
|
2004-09-04 13:13:48 +00:00
|
|
|
smime-keys nil nil nil nil (car-safe (car-safe smime-keys))))))
|
|
|
|
|
(goto-char (point-min))
|
|
|
|
|
(while (search-forward "\r\n" nil t)
|
|
|
|
|
(replace-match "\n"))
|
|
|
|
|
(goto-char (point-min)))
|
|
|
|
|
|
2000-09-19 13:40:08 +00:00
|
|
|
(provide 'mm-view)
|
|
|
|
|
|
2003-09-01 15:45:59 +00:00
|
|
|
;;; arch-tag: b60e749a-d05c-47f2-bccd-bdaa59327cb2
|
2001-07-15 17:42:53 +00:00
|
|
|
;;; mm-view.el ends here
|