2004-09-04 13:13:48 +00:00
|
|
|
|
;;; mm-decode.el --- Functions for decoding MIME things
|
2005-08-06 19:51:42 +00:00
|
|
|
|
|
2012-02-28 08:17:21 +00:00
|
|
|
|
;; Copyright (C) 1998-2012 Free Software Foundation, Inc.
|
2000-09-19 13:40:08 +00:00
|
|
|
|
|
|
|
|
|
;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
|
|
|
|
|
;; MORIOKA Tomohiko <morioka@jaist.ac.jp>
|
|
|
|
|
;; This file is part of GNU Emacs.
|
|
|
|
|
|
2008-05-06 03:56:49 +00:00
|
|
|
|
;; GNU Emacs is free software: you can redistribute it and/or modify
|
2000-09-19 13:40:08 +00:00
|
|
|
|
;; it under the terms of the GNU General Public License as published by
|
2008-05-06 03:56:49 +00:00
|
|
|
|
;; the Free Software Foundation, either version 3 of the License, or
|
|
|
|
|
;; (at your option) any later version.
|
2000-09-19 13:40:08 +00:00
|
|
|
|
|
|
|
|
|
;; GNU Emacs is distributed in the hope that it will be useful,
|
|
|
|
|
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
|
2008-05-06 03:56:49 +00:00
|
|
|
|
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
2000-09-19 13:40:08 +00:00
|
|
|
|
;; GNU General Public License for more details.
|
|
|
|
|
|
|
|
|
|
;; You should have received a copy of the GNU General Public License
|
2008-05-06 03:56:49 +00:00
|
|
|
|
;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
|
2000-09-19 13:40:08 +00:00
|
|
|
|
|
|
|
|
|
;;; Commentary:
|
|
|
|
|
|
|
|
|
|
;;; Code:
|
|
|
|
|
|
2010-10-11 23:29:33 +00:00
|
|
|
|
;; For Emacs <22.2 and XEmacs.
|
2007-12-11 05:41:13 +00:00
|
|
|
|
(eval-and-compile
|
|
|
|
|
(unless (fboundp 'declare-function) (defmacro declare-function (&rest r))))
|
|
|
|
|
|
2000-09-19 13:40:08 +00:00
|
|
|
|
(require 'mail-parse)
|
|
|
|
|
(require 'mm-bodies)
|
2004-09-04 13:13:48 +00:00
|
|
|
|
(eval-when-compile (require 'cl)
|
|
|
|
|
(require 'term))
|
2000-09-19 13:40:08 +00:00
|
|
|
|
|
Stop message.el from loading about 40 libraries it doesn't always need.
The general approach is to autoload rather than require, and to
require in the specific functions rather than the file. (Bug#5642)
* url/url.el: Move mailcap require earlier in the file.
* gnus/gmm-utils.el: Don't require wid-edit.
(widget-create-child-value, widget-convert, widget-default-get):
Autoload.
* gnus/gnus-util.el: Don't require time-date, netrc.
(message-fetch-field, gnus-group-name-decode): Declare rather than
autoloading.
(gnus-fetch-field): Require message.
(gnus-decode-newsgroups): Require gnus-group.
* gnus/ietf-drums.el: Don't require time-date.
* gnus/message.el: Don't require hashcash, canlock, ecomplete.
Do require mail-utils. Require nnheader only when compiling.
(smtpmail-default-smtp-server): Remove declaration.
(message-send-mail-function): Check smtpmail-default-smtp-server
is bound rather than requiring smtpmail.
(message-auto-save-directory, message-insert-signature): Use
expand-file-name rather than nnheader-concat.
(nnheader-insert-file-contents): Autoload.
(hashcash-wait-async): Declare.
(message-send-mail): Only call gnus-setup-posting-charset if
gnus-group-posting-charset-alist is bound. Require hashcash if needed.
(message-send-mail-with-sendmail): Require sendmail.
(canlock-password, canlock-password-for-verify): Declare.
(message-canlock-password): Require canlock.
(nnheader-get-report): Autoload.
(gnus-setup-posting-charset): Declare.
(message-send-news): Require gnus-msg.
(message-make-references, message-make-in-reply-to): Use mail-header-id
rather than the alias mail-header-message-id.
(ecomplete-add-item, ecomplete-save): Declare.
(message-put-addresses-in-ecomplete): Require ecomplete.
(ecomplete-display-matches): Autoload.
* gnus/mm-decode.el: Don't require mailcap, gnus-util.
(gnus-map-function, gnus-replace-in-string, gnus-read-shell-command)
(message-fetch-field, mailcap-parse-mailcaps, mailcap-mime-info):
Autoload.
(mailcap-mime-extensions): Declare.
* gnus/mm-encode.el: Don't require mailcap.
(mailcap-extension-to-mime): Autoload.
* gnus/mml-sec.el: Don't require password-cache.
* gnus/mml.el (gnus-setup-posting-charset): Declare rather than autoload.
(mailcap-parse-mimetypes, mailcap-mime-types): Declare.
(mml-minibuffer-read-type): Require mailcap.
(mml-preview): Require gnus-msg.
* gnus/mml1991.el: Require password-cache.
(password-cache-expiry): Remove declaration.
* gnus/mml2015.el: Require password-cache.
(password-cache-expiry): Remove declaration.
* gnus/nneething.el (mailcap): Require mailcap.
* gnus/nnheader.el: (declare-function): Add compatibility stub.
(message-remove-header): Declare rather than autoload.
(nnheader-replace-header): Require message.
* gnus/nnimap.el (declare-function): Add compatibility stub.
(netrc-parse, netrc-machine-user-or-password): Declare.
(nnimap-open-connection): Require netrc.
* gnus/nntp.el (declare-function): Add compatibility stub.
(netrc-parse, netrc-machine, netrc-get): Declare.
(nntp-send-authinfo): Require netrc.
* gnus/rfc2047.el: Don't require qp.
(quoted-printable-encode-region, quoted-printable-decode-string):
Autoload.
* gnus/sieve-mode.el: Don't require easymenu.
(easy-menu-add-item): Autoload it.
* gnus/spam-stat.el (time-to-number-of-days): Autoload it.
* password-cache.el (password-cache, password-cache-expiry):
Autoload.
2010-03-19 02:55:37 +00:00
|
|
|
|
(autoload 'gnus-map-function "gnus-util")
|
|
|
|
|
(autoload 'gnus-replace-in-string "gnus-util")
|
|
|
|
|
(autoload 'gnus-read-shell-command "gnus-util")
|
|
|
|
|
|
2008-06-11 03:10:59 +00:00
|
|
|
|
(autoload 'mm-inline-partial "mm-partial")
|
|
|
|
|
(autoload 'mm-inline-external-body "mm-extern")
|
|
|
|
|
(autoload 'mm-extern-cache-contents "mm-extern")
|
|
|
|
|
(autoload 'mm-insert-inline "mm-view")
|
2000-09-19 13:40:08 +00:00
|
|
|
|
|
2005-08-31 13:06:31 +00:00
|
|
|
|
(defvar gnus-current-window-configuration)
|
|
|
|
|
|
2004-09-04 13:13:48 +00:00
|
|
|
|
(add-hook 'gnus-exit-gnus-hook 'mm-destroy-postponed-undisplay-list)
|
|
|
|
|
|
2000-09-19 13:40:08 +00:00
|
|
|
|
(defgroup mime-display ()
|
|
|
|
|
"Display of MIME in mail and news articles."
|
2004-09-04 13:13:48 +00:00
|
|
|
|
:link '(custom-manual "(emacs-mime)Display Customization")
|
2000-09-19 13:40:08 +00:00
|
|
|
|
:version "21.1"
|
|
|
|
|
:group 'mail
|
|
|
|
|
:group 'news
|
|
|
|
|
:group 'multimedia)
|
|
|
|
|
|
2004-09-04 13:13:48 +00:00
|
|
|
|
(defgroup mime-security ()
|
|
|
|
|
"MIME security in mail and news articles."
|
|
|
|
|
:link '(custom-manual "(emacs-mime)Display Customization")
|
|
|
|
|
:group 'mail
|
|
|
|
|
:group 'news
|
|
|
|
|
:group 'multimedia)
|
|
|
|
|
|
2000-09-19 13:40:08 +00:00
|
|
|
|
;;; Convenience macros.
|
|
|
|
|
|
|
|
|
|
(defmacro mm-handle-buffer (handle)
|
|
|
|
|
`(nth 0 ,handle))
|
|
|
|
|
(defmacro mm-handle-type (handle)
|
|
|
|
|
`(nth 1 ,handle))
|
|
|
|
|
(defsubst mm-handle-media-type (handle)
|
|
|
|
|
(if (stringp (car handle))
|
|
|
|
|
(car handle)
|
|
|
|
|
(car (mm-handle-type handle))))
|
|
|
|
|
(defsubst mm-handle-media-supertype (handle)
|
|
|
|
|
(car (split-string (mm-handle-media-type handle) "/")))
|
|
|
|
|
(defsubst mm-handle-media-subtype (handle)
|
|
|
|
|
(cadr (split-string (mm-handle-media-type handle) "/")))
|
|
|
|
|
(defmacro mm-handle-encoding (handle)
|
|
|
|
|
`(nth 2 ,handle))
|
|
|
|
|
(defmacro mm-handle-undisplayer (handle)
|
|
|
|
|
`(nth 3 ,handle))
|
|
|
|
|
(defmacro mm-handle-set-undisplayer (handle function)
|
|
|
|
|
`(setcar (nthcdr 3 ,handle) ,function))
|
|
|
|
|
(defmacro mm-handle-disposition (handle)
|
|
|
|
|
`(nth 4 ,handle))
|
|
|
|
|
(defmacro mm-handle-description (handle)
|
|
|
|
|
`(nth 5 ,handle))
|
|
|
|
|
(defmacro mm-handle-cache (handle)
|
|
|
|
|
`(nth 6 ,handle))
|
|
|
|
|
(defmacro mm-handle-set-cache (handle contents)
|
|
|
|
|
`(setcar (nthcdr 6 ,handle) ,contents))
|
|
|
|
|
(defmacro mm-handle-id (handle)
|
|
|
|
|
`(nth 7 ,handle))
|
2004-09-04 13:13:48 +00:00
|
|
|
|
(defmacro mm-handle-multipart-original-buffer (handle)
|
|
|
|
|
`(get-text-property 0 'buffer (car ,handle)))
|
|
|
|
|
(defmacro mm-handle-multipart-from (handle)
|
|
|
|
|
`(get-text-property 0 'from (car ,handle)))
|
|
|
|
|
(defmacro mm-handle-multipart-ctl-parameter (handle parameter)
|
|
|
|
|
`(get-text-property 0 ,parameter (car ,handle)))
|
|
|
|
|
|
2000-09-19 13:40:08 +00:00
|
|
|
|
(defmacro mm-make-handle (&optional buffer type encoding undisplayer
|
|
|
|
|
disposition description cache
|
|
|
|
|
id)
|
|
|
|
|
`(list ,buffer ,type ,encoding ,undisplayer
|
|
|
|
|
,disposition ,description ,cache ,id))
|
|
|
|
|
|
2004-09-04 13:13:48 +00:00
|
|
|
|
(defcustom mm-text-html-renderer
|
2010-10-20 22:29:38 +00:00
|
|
|
|
(cond ((fboundp 'libxml-parse-html-region) 'shr)
|
|
|
|
|
((executable-find "w3m") 'gnus-w3m)
|
2004-09-04 13:13:48 +00:00
|
|
|
|
((executable-find "links") 'links)
|
|
|
|
|
((executable-find "lynx") 'lynx)
|
2008-03-10 00:50:22 +00:00
|
|
|
|
((locate-library "w3") 'w3)
|
|
|
|
|
((locate-library "html2text") 'html2text)
|
|
|
|
|
(t nil))
|
2004-09-04 13:13:48 +00:00
|
|
|
|
"Render of HTML contents.
|
|
|
|
|
It is one of defined renderer types, or a rendering function.
|
|
|
|
|
The defined renderer types are:
|
2011-07-05 22:27:16 +00:00
|
|
|
|
`shr': use the built-in Gnus HTML renderer;
|
|
|
|
|
`gnus-w3m': use Gnus renderer based on w3m;
|
|
|
|
|
`w3m': use emacs-w3m;
|
|
|
|
|
`w3m-standalone': use plain w3m;
|
2004-09-04 13:13:48 +00:00
|
|
|
|
`links': use links;
|
2011-07-05 22:27:16 +00:00
|
|
|
|
`lynx': use lynx;
|
|
|
|
|
`w3': use Emacs/W3;
|
|
|
|
|
`html2text': use html2text;
|
2008-03-10 00:50:22 +00:00
|
|
|
|
nil : use external viewer (default web browser)."
|
2010-08-31 04:21:18 +00:00
|
|
|
|
:version "24.1"
|
2010-10-20 22:29:38 +00:00
|
|
|
|
:type '(choice (const shr)
|
|
|
|
|
(const gnus-w3m)
|
2010-09-18 10:02:19 +00:00
|
|
|
|
(const w3)
|
|
|
|
|
(const w3m :tag "emacs-w3m")
|
2008-03-10 00:50:22 +00:00
|
|
|
|
(const w3m-standalone :tag "standalone w3m" )
|
2004-09-04 13:13:48 +00:00
|
|
|
|
(const links)
|
|
|
|
|
(const lynx)
|
|
|
|
|
(const html2text)
|
2008-03-10 00:50:22 +00:00
|
|
|
|
(const nil :tag "External viewer")
|
2004-09-04 13:13:48 +00:00
|
|
|
|
(function))
|
|
|
|
|
:group 'mime-display)
|
|
|
|
|
|
|
|
|
|
(defcustom mm-inline-text-html-with-images nil
|
|
|
|
|
"If non-nil, Gnus will allow retrieving images in HTML contents with
|
|
|
|
|
the <img> tags. It has no effect on Emacs/w3. See also the
|
|
|
|
|
documentation for the `mm-w3m-safe-url-regexp' variable."
|
2005-02-09 15:50:47 +00:00
|
|
|
|
:version "22.1"
|
2004-09-04 13:13:48 +00:00
|
|
|
|
:type 'boolean
|
|
|
|
|
:group 'mime-display)
|
|
|
|
|
|
|
|
|
|
(defcustom mm-w3m-safe-url-regexp "\\`cid:"
|
|
|
|
|
"Regexp matching URLs which are considered to be safe.
|
|
|
|
|
Some HTML mails might contain a nasty trick used by spammers, using
|
|
|
|
|
the <img> tag which is far more evil than the [Click Here!] button.
|
|
|
|
|
It is most likely intended to check whether the ominous spam mail has
|
|
|
|
|
reached your eyes or not, in which case the spammer knows for sure
|
|
|
|
|
that your email address is valid. It is done by embedding an
|
|
|
|
|
identifier string into a URL that you might automatically retrieve
|
|
|
|
|
when displaying the image. The default value is \"\\\\`cid:\" which only
|
|
|
|
|
matches parts embedded to the Multipart/Related type MIME contents and
|
|
|
|
|
Gnus will never connect to the spammer's site arbitrarily. You may
|
|
|
|
|
set this variable to nil if you consider all urls to be safe."
|
2005-02-09 15:50:47 +00:00
|
|
|
|
:version "22.1"
|
2004-09-04 13:13:48 +00:00
|
|
|
|
:type '(choice (regexp :tag "Regexp")
|
|
|
|
|
(const :tag "All URLs are safe" nil))
|
|
|
|
|
:group 'mime-display)
|
|
|
|
|
|
|
|
|
|
(defcustom mm-inline-text-html-with-w3m-keymap t
|
|
|
|
|
"If non-nil, use emacs-w3m command keys in the article buffer."
|
2005-02-09 15:50:47 +00:00
|
|
|
|
:version "22.1"
|
2004-09-04 13:13:48 +00:00
|
|
|
|
:type 'boolean
|
|
|
|
|
:group 'mime-display)
|
|
|
|
|
|
|
|
|
|
(defcustom mm-enable-external t
|
|
|
|
|
"Indicate whether external MIME handlers should be used.
|
|
|
|
|
|
|
|
|
|
If t, all defined external MIME handlers are used. If nil, files are saved by
|
|
|
|
|
`mailcap-save-binary-file'. If it is the symbol `ask', you are prompted
|
|
|
|
|
before the external MIME handler is invoked."
|
2005-02-09 15:50:47 +00:00
|
|
|
|
:version "22.1"
|
2004-09-04 13:13:48 +00:00
|
|
|
|
:type '(choice (const :tag "Always" t)
|
|
|
|
|
(const :tag "Never" nil)
|
|
|
|
|
(const :tag "Ask" ask))
|
|
|
|
|
:group 'mime-display)
|
|
|
|
|
|
2000-09-19 13:40:08 +00:00
|
|
|
|
(defcustom mm-inline-media-tests
|
2004-09-04 13:13:48 +00:00
|
|
|
|
'(("image/p?jpeg"
|
2000-09-19 13:40:08 +00:00
|
|
|
|
mm-inline-image
|
|
|
|
|
(lambda (handle)
|
|
|
|
|
(mm-valid-and-fit-image-p 'jpeg handle)))
|
|
|
|
|
("image/png"
|
|
|
|
|
mm-inline-image
|
|
|
|
|
(lambda (handle)
|
|
|
|
|
(mm-valid-and-fit-image-p 'png handle)))
|
|
|
|
|
("image/gif"
|
|
|
|
|
mm-inline-image
|
|
|
|
|
(lambda (handle)
|
|
|
|
|
(mm-valid-and-fit-image-p 'gif handle)))
|
|
|
|
|
("image/tiff"
|
|
|
|
|
mm-inline-image
|
|
|
|
|
(lambda (handle)
|
2011-09-17 12:02:10 +00:00
|
|
|
|
(mm-valid-and-fit-image-p 'tiff handle)))
|
2000-09-19 13:40:08 +00:00
|
|
|
|
("image/xbm"
|
|
|
|
|
mm-inline-image
|
|
|
|
|
(lambda (handle)
|
|
|
|
|
(mm-valid-and-fit-image-p 'xbm handle)))
|
|
|
|
|
("image/x-xbitmap"
|
|
|
|
|
mm-inline-image
|
|
|
|
|
(lambda (handle)
|
|
|
|
|
(mm-valid-and-fit-image-p 'xbm handle)))
|
|
|
|
|
("image/xpm"
|
|
|
|
|
mm-inline-image
|
|
|
|
|
(lambda (handle)
|
|
|
|
|
(mm-valid-and-fit-image-p 'xpm handle)))
|
2004-09-04 13:13:48 +00:00
|
|
|
|
("image/x-xpixmap"
|
2000-09-19 13:40:08 +00:00
|
|
|
|
mm-inline-image
|
|
|
|
|
(lambda (handle)
|
|
|
|
|
(mm-valid-and-fit-image-p 'xpm handle)))
|
|
|
|
|
("image/bmp"
|
|
|
|
|
mm-inline-image
|
|
|
|
|
(lambda (handle)
|
|
|
|
|
(mm-valid-and-fit-image-p 'bmp handle)))
|
2001-01-04 14:47:59 +00:00
|
|
|
|
("image/x-portable-bitmap"
|
|
|
|
|
mm-inline-image
|
|
|
|
|
(lambda (handle)
|
|
|
|
|
(mm-valid-and-fit-image-p 'pbm handle)))
|
2000-09-19 13:40:08 +00:00
|
|
|
|
("text/plain" mm-inline-text identity)
|
|
|
|
|
("text/enriched" mm-inline-text identity)
|
|
|
|
|
("text/richtext" mm-inline-text identity)
|
2011-02-01 23:46:27 +00:00
|
|
|
|
("text/x-patch" mm-display-patch-inline identity)
|
2008-04-05 20:05:50 +00:00
|
|
|
|
;; In case mime.types uses x-diff (as does Debian's mime-support-3.40).
|
2011-02-01 23:46:27 +00:00
|
|
|
|
("text/x-diff" mm-display-patch-inline identity)
|
2000-09-20 11:46:48 +00:00
|
|
|
|
("application/emacs-lisp" mm-display-elisp-inline identity)
|
2004-09-04 13:13:48 +00:00
|
|
|
|
("application/x-emacs-lisp" mm-display-elisp-inline identity)
|
2011-01-20 23:43:27 +00:00
|
|
|
|
("application/x-shellscript" mm-display-shell-script-inline identity)
|
|
|
|
|
("application/x-sh" mm-display-shell-script-inline identity)
|
|
|
|
|
("text/x-sh" mm-display-shell-script-inline identity)
|
2011-01-25 23:51:40 +00:00
|
|
|
|
("application/javascript" mm-display-javascript-inline identity)
|
2007-10-28 09:18:39 +00:00
|
|
|
|
("text/dns" mm-display-dns-inline identity)
|
2011-01-23 11:21:04 +00:00
|
|
|
|
("text/x-org" mm-display-org-inline identity)
|
2000-09-19 13:40:08 +00:00
|
|
|
|
("text/html"
|
2004-09-04 13:13:48 +00:00
|
|
|
|
mm-inline-text-html
|
2000-09-19 13:40:08 +00:00
|
|
|
|
(lambda (handle)
|
2010-10-20 22:29:38 +00:00
|
|
|
|
mm-text-html-renderer))
|
2000-09-19 13:40:08 +00:00
|
|
|
|
("text/x-vcard"
|
2004-09-04 13:13:48 +00:00
|
|
|
|
mm-inline-text-vcard
|
2000-09-19 13:40:08 +00:00
|
|
|
|
(lambda (handle)
|
|
|
|
|
(or (featurep 'vcard)
|
|
|
|
|
(locate-library "vcard"))))
|
|
|
|
|
("message/delivery-status" mm-inline-text identity)
|
|
|
|
|
("message/rfc822" mm-inline-message identity)
|
|
|
|
|
("message/partial" mm-inline-partial identity)
|
2004-09-04 13:13:48 +00:00
|
|
|
|
("message/external-body" mm-inline-external-body identity)
|
2000-09-19 13:40:08 +00:00
|
|
|
|
("text/.*" mm-inline-text identity)
|
|
|
|
|
("audio/wav" mm-inline-audio
|
|
|
|
|
(lambda (handle)
|
|
|
|
|
(and (or (featurep 'nas-sound) (featurep 'native-sound))
|
|
|
|
|
(device-sound-enabled-p))))
|
|
|
|
|
("audio/au"
|
|
|
|
|
mm-inline-audio
|
|
|
|
|
(lambda (handle)
|
|
|
|
|
(and (or (featurep 'nas-sound) (featurep 'native-sound))
|
|
|
|
|
(device-sound-enabled-p))))
|
|
|
|
|
("application/pgp-signature" ignore identity)
|
2004-09-04 13:13:48 +00:00
|
|
|
|
("application/x-pkcs7-signature" ignore identity)
|
|
|
|
|
("application/pkcs7-signature" ignore identity)
|
|
|
|
|
("application/x-pkcs7-mime" ignore identity)
|
|
|
|
|
("application/pkcs7-mime" ignore identity)
|
2000-09-19 13:40:08 +00:00
|
|
|
|
("multipart/alternative" ignore identity)
|
|
|
|
|
("multipart/mixed" ignore identity)
|
2004-09-04 13:13:48 +00:00
|
|
|
|
("multipart/related" ignore identity)
|
2011-09-19 22:06:57 +00:00
|
|
|
|
("image/.*"
|
2011-09-17 12:02:10 +00:00
|
|
|
|
mm-inline-image
|
|
|
|
|
(lambda (handle)
|
|
|
|
|
(and (mm-valid-image-format-p 'imagemagick)
|
|
|
|
|
(mm-with-unibyte-buffer
|
|
|
|
|
(mm-insert-part handle)
|
|
|
|
|
(let ((image
|
|
|
|
|
(ignore-errors
|
|
|
|
|
(if (fboundp 'create-image)
|
|
|
|
|
(create-image (buffer-string) 'imagemagick 'data-p)
|
2011-12-15 23:35:40 +00:00
|
|
|
|
(mm-create-image-xemacs (mm-handle-media-subtype handle))))))
|
2011-09-17 12:02:10 +00:00
|
|
|
|
(when image
|
|
|
|
|
(setcar (cdr handle) (list "image/imagemagick"))
|
|
|
|
|
(mm-image-fit-p handle)))))))
|
2004-09-04 13:13:48 +00:00
|
|
|
|
;; Disable audio and image
|
|
|
|
|
("audio/.*" ignore ignore)
|
|
|
|
|
("image/.*" ignore ignore)
|
|
|
|
|
;; Default to displaying as text
|
|
|
|
|
(".*" mm-inline-text mm-readable-p))
|
2000-09-19 13:40:08 +00:00
|
|
|
|
"Alist of media types/tests saying whether types can be displayed inline."
|
2004-09-04 13:13:48 +00:00
|
|
|
|
:type '(repeat (list (regexp :tag "MIME type")
|
2000-09-19 13:40:08 +00:00
|
|
|
|
(function :tag "Display function")
|
|
|
|
|
(function :tag "Display test")))
|
|
|
|
|
:group 'mime-display)
|
|
|
|
|
|
|
|
|
|
(defcustom mm-inlined-types
|
|
|
|
|
'("image/.*" "text/.*" "message/delivery-status" "message/rfc822"
|
2004-09-04 13:13:48 +00:00
|
|
|
|
"message/partial" "message/external-body" "application/emacs-lisp"
|
|
|
|
|
"application/x-emacs-lisp"
|
|
|
|
|
"application/pgp-signature" "application/x-pkcs7-signature"
|
|
|
|
|
"application/pkcs7-signature" "application/x-pkcs7-mime"
|
2006-01-20 03:44:29 +00:00
|
|
|
|
"application/pkcs7-mime"
|
|
|
|
|
;; Mutt still uses this even though it has already been withdrawn.
|
|
|
|
|
"application/pgp")
|
2004-09-04 13:13:48 +00:00
|
|
|
|
"List of media types that are to be displayed inline.
|
|
|
|
|
See also `mm-inline-media-tests', which says how to display a media
|
|
|
|
|
type inline."
|
2005-12-17 21:41:34 +00:00
|
|
|
|
:type '(repeat regexp)
|
2004-09-04 13:13:48 +00:00
|
|
|
|
:group 'mime-display)
|
|
|
|
|
|
|
|
|
|
(defcustom mm-keep-viewer-alive-types
|
|
|
|
|
'("application/postscript" "application/msword" "application/vnd.ms-excel"
|
|
|
|
|
"application/pdf" "application/x-dvi")
|
|
|
|
|
"List of media types for which the external viewer will not be killed
|
|
|
|
|
when selecting a different article."
|
2005-02-09 15:50:47 +00:00
|
|
|
|
:version "22.1"
|
2005-12-17 21:41:34 +00:00
|
|
|
|
:type '(repeat regexp)
|
2000-09-19 13:40:08 +00:00
|
|
|
|
:group 'mime-display)
|
2003-02-04 13:24:35 +00:00
|
|
|
|
|
2000-09-19 13:40:08 +00:00
|
|
|
|
(defcustom mm-automatic-display
|
2007-10-28 09:18:39 +00:00
|
|
|
|
'("text/plain" "text/enriched" "text/richtext" "text/html" "text/x-verbatim"
|
2000-09-19 13:40:08 +00:00
|
|
|
|
"text/x-vcard" "image/.*" "message/delivery-status" "multipart/.*"
|
2007-10-28 09:18:39 +00:00
|
|
|
|
"message/rfc822" "text/x-patch" "text/dns" "application/pgp-signature"
|
2004-09-04 13:13:48 +00:00
|
|
|
|
"application/emacs-lisp" "application/x-emacs-lisp"
|
|
|
|
|
"application/x-pkcs7-signature"
|
|
|
|
|
"application/pkcs7-signature" "application/x-pkcs7-mime"
|
2006-01-20 03:44:29 +00:00
|
|
|
|
"application/pkcs7-mime"
|
|
|
|
|
;; Mutt still uses this even though it has already been withdrawn.
|
2011-01-20 23:43:27 +00:00
|
|
|
|
"application/pgp\\'"
|
2011-01-23 11:21:04 +00:00
|
|
|
|
"text/x-org")
|
2000-09-19 13:40:08 +00:00
|
|
|
|
"A list of MIME types to be displayed automatically."
|
2005-12-17 21:41:34 +00:00
|
|
|
|
:type '(repeat regexp)
|
2000-09-19 13:40:08 +00:00
|
|
|
|
:group 'mime-display)
|
|
|
|
|
|
2004-09-04 13:13:48 +00:00
|
|
|
|
(defcustom mm-attachment-override-types '("text/x-vcard"
|
|
|
|
|
"application/pkcs7-mime"
|
|
|
|
|
"application/x-pkcs7-mime"
|
|
|
|
|
"application/pkcs7-signature"
|
|
|
|
|
"application/x-pkcs7-signature")
|
2000-09-19 13:40:08 +00:00
|
|
|
|
"Types to have \"attachment\" ignored if they can be displayed inline."
|
2005-12-17 21:41:34 +00:00
|
|
|
|
:type '(repeat regexp)
|
2000-09-19 13:40:08 +00:00
|
|
|
|
:group 'mime-display)
|
|
|
|
|
|
|
|
|
|
(defcustom mm-inline-override-types nil
|
|
|
|
|
"Types to be treated as attachments even if they can be displayed inline."
|
2005-12-17 21:41:34 +00:00
|
|
|
|
:type '(repeat regexp)
|
2000-09-19 13:40:08 +00:00
|
|
|
|
:group 'mime-display)
|
|
|
|
|
|
|
|
|
|
(defcustom mm-automatic-external-display nil
|
|
|
|
|
"List of MIME type regexps that will be displayed externally automatically."
|
2005-12-17 21:41:34 +00:00
|
|
|
|
:type '(repeat regexp)
|
2000-09-19 13:40:08 +00:00
|
|
|
|
:group 'mime-display)
|
|
|
|
|
|
|
|
|
|
(defcustom mm-discouraged-alternatives nil
|
|
|
|
|
"List of MIME types that are discouraged when viewing multipart/alternative.
|
|
|
|
|
Viewing agents are supposed to view the last possible part of a message,
|
|
|
|
|
as that is supposed to be the richest. However, users may prefer other
|
|
|
|
|
types instead, and this list says what types are most unwanted. If,
|
|
|
|
|
for instance, text/html parts are very unwanted, and text/richtext are
|
|
|
|
|
somewhat unwanted, then the value of this variable should be set
|
|
|
|
|
to:
|
|
|
|
|
|
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
|
|
|
|
(\"text/html\" \"text/richtext\")
|
|
|
|
|
|
|
|
|
|
Adding \"image/.*\" might also be useful. Spammers use it as the
|
2011-11-25 07:14:48 +00:00
|
|
|
|
preferred part of multipart/alternative messages. See also
|
2005-12-17 21:41:34 +00:00
|
|
|
|
`gnus-buttonized-mime-types', to which adding \"multipart/alternative\"
|
|
|
|
|
enables you to choose manually one of two types those mails include."
|
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
|
|
|
|
:type '(repeat regexp) ;; See `mm-preferred-alternative-precedence'.
|
2000-09-19 13:40:08 +00:00
|
|
|
|
:group 'mime-display)
|
|
|
|
|
|
2004-09-04 13:13:48 +00:00
|
|
|
|
(defcustom mm-tmp-directory
|
|
|
|
|
(if (fboundp 'temp-directory)
|
|
|
|
|
(temp-directory)
|
|
|
|
|
(if (boundp 'temporary-file-directory)
|
|
|
|
|
temporary-file-directory
|
|
|
|
|
"/tmp/"))
|
|
|
|
|
"Where mm will store its temporary files."
|
|
|
|
|
:type 'directory
|
|
|
|
|
:group 'mime-display)
|
2000-09-19 13:40:08 +00:00
|
|
|
|
|
|
|
|
|
(defcustom mm-inline-large-images nil
|
2010-10-04 00:17:16 +00:00
|
|
|
|
"If t, then all images fit in the buffer.
|
|
|
|
|
If 'resize, try to resize the images so they fit."
|
|
|
|
|
:type '(radio
|
|
|
|
|
(const :tag "Inline large images as they are." t)
|
|
|
|
|
(const :tag "Resize large images." resize)
|
|
|
|
|
(const :tag "Do not inline large images." nil))
|
2000-09-19 13:40:08 +00:00
|
|
|
|
:group 'mime-display)
|
|
|
|
|
|
2007-10-28 09:18:39 +00:00
|
|
|
|
(defcustom mm-file-name-rewrite-functions
|
2004-09-04 13:13:48 +00:00
|
|
|
|
'(mm-file-name-delete-control mm-file-name-delete-gotchas)
|
2007-10-28 09:18:39 +00:00
|
|
|
|
"List of functions used for rewriting file names of MIME parts.
|
2004-09-04 13:13:48 +00:00
|
|
|
|
Each function takes a file name as input and returns a file name.
|
|
|
|
|
|
2007-10-28 09:18:39 +00:00
|
|
|
|
Ready-made functions include `mm-file-name-delete-control',
|
|
|
|
|
`mm-file-name-delete-gotchas' (you should not remove these two
|
|
|
|
|
functions), `mm-file-name-delete-whitespace',
|
|
|
|
|
`mm-file-name-trim-whitespace', `mm-file-name-collapse-whitespace',
|
|
|
|
|
`mm-file-name-replace-whitespace', `capitalize', `downcase',
|
|
|
|
|
`upcase', and `upcase-initials'."
|
|
|
|
|
:type '(list (set :inline t
|
|
|
|
|
(const mm-file-name-delete-control)
|
|
|
|
|
(const mm-file-name-delete-gotchas)
|
|
|
|
|
(const mm-file-name-delete-whitespace)
|
|
|
|
|
(const mm-file-name-trim-whitespace)
|
|
|
|
|
(const mm-file-name-collapse-whitespace)
|
|
|
|
|
(const mm-file-name-replace-whitespace)
|
|
|
|
|
(const capitalize)
|
|
|
|
|
(const downcase)
|
|
|
|
|
(const upcase)
|
|
|
|
|
(const upcase-initials)
|
|
|
|
|
(repeat :inline t
|
|
|
|
|
:tag "Function"
|
|
|
|
|
function)))
|
2008-02-29 04:03:49 +00:00
|
|
|
|
:version "23.1" ;; No Gnus
|
2007-10-28 09:18:39 +00:00
|
|
|
|
:group 'mime-display)
|
|
|
|
|
|
2004-09-04 13:13:48 +00:00
|
|
|
|
|
|
|
|
|
(defvar mm-path-name-rewrite-functions nil
|
|
|
|
|
"*List of functions for rewriting the full file names of MIME parts.
|
|
|
|
|
This is used when viewing parts externally, and is meant for
|
|
|
|
|
transforming the absolute name so that non-compliant programs can find
|
|
|
|
|
the file where it's saved.
|
|
|
|
|
|
|
|
|
|
Each function takes a file name as input and returns a file name.")
|
|
|
|
|
|
|
|
|
|
(defvar mm-file-name-replace-whitespace nil
|
|
|
|
|
"String used for replacing whitespace characters; default is `\"_\"'.")
|
|
|
|
|
|
|
|
|
|
(defcustom mm-default-directory nil
|
|
|
|
|
"The default directory where mm will save files.
|
|
|
|
|
If not set, `default-directory' will be used."
|
|
|
|
|
:type '(choice directory (const :tag "Default" nil))
|
|
|
|
|
:group 'mime-display)
|
|
|
|
|
|
|
|
|
|
(defcustom mm-attachment-file-modes 384
|
|
|
|
|
"Set the mode bits of saved attachments to this integer."
|
2005-02-09 15:50:47 +00:00
|
|
|
|
:version "22.1"
|
2004-09-04 13:13:48 +00:00
|
|
|
|
:type 'integer
|
|
|
|
|
:group 'mime-display)
|
|
|
|
|
|
|
|
|
|
(defcustom mm-external-terminal-program "xterm"
|
|
|
|
|
"The program to start an external terminal."
|
2005-02-09 15:50:47 +00:00
|
|
|
|
:version "22.1"
|
2004-09-04 13:13:48 +00:00
|
|
|
|
:type 'string
|
|
|
|
|
:group 'mime-display)
|
|
|
|
|
|
2000-09-19 13:40:08 +00:00
|
|
|
|
;;; Internal variables.
|
|
|
|
|
|
|
|
|
|
(defvar mm-last-shell-command "")
|
|
|
|
|
(defvar mm-content-id-alist nil)
|
2004-09-04 13:13:48 +00:00
|
|
|
|
(defvar mm-postponed-undisplay-list nil)
|
2000-09-19 13:40:08 +00:00
|
|
|
|
|
|
|
|
|
;; According to RFC2046, in particular, in a digest, the default
|
|
|
|
|
;; Content-Type value for a body part is changed from "text/plain" to
|
|
|
|
|
;; "message/rfc822".
|
|
|
|
|
(defvar mm-dissect-default-type "text/plain")
|
|
|
|
|
|
2004-09-04 13:13:48 +00:00
|
|
|
|
(autoload 'mml2015-verify "mml2015")
|
|
|
|
|
(autoload 'mml2015-verify-test "mml2015")
|
|
|
|
|
(autoload 'mml-smime-verify "mml-smime")
|
|
|
|
|
(autoload 'mml-smime-verify-test "mml-smime")
|
|
|
|
|
|
|
|
|
|
(defvar mm-verify-function-alist
|
|
|
|
|
'(("application/pgp-signature" mml2015-verify "PGP" mml2015-verify-test)
|
|
|
|
|
("application/x-gnus-pgp-signature" mm-uu-pgp-signed-extract-1 "PGP"
|
|
|
|
|
mm-uu-pgp-signed-test)
|
|
|
|
|
("application/pkcs7-signature" mml-smime-verify "S/MIME"
|
|
|
|
|
mml-smime-verify-test)
|
|
|
|
|
("application/x-pkcs7-signature" mml-smime-verify "S/MIME"
|
|
|
|
|
mml-smime-verify-test)))
|
|
|
|
|
|
|
|
|
|
(defcustom mm-verify-option 'never
|
|
|
|
|
"Option of verifying signed parts.
|
|
|
|
|
`never', not verify; `always', always verify;
|
2007-10-28 09:18:39 +00:00
|
|
|
|
`known', only verify known protocols. Otherwise, ask user.
|
|
|
|
|
|
|
|
|
|
When set to `always' or `known', you should add
|
|
|
|
|
\"multipart/signed\" to `gnus-buttonized-mime-types' to see
|
|
|
|
|
result of the verification."
|
2005-02-09 15:50:47 +00:00
|
|
|
|
:version "22.1"
|
2004-09-04 13:13:48 +00:00
|
|
|
|
:type '(choice (item always)
|
|
|
|
|
(item never)
|
|
|
|
|
(item :tag "only known protocols" known)
|
|
|
|
|
(item :tag "ask" nil))
|
|
|
|
|
:group 'mime-security)
|
|
|
|
|
|
|
|
|
|
(autoload 'mml2015-decrypt "mml2015")
|
|
|
|
|
(autoload 'mml2015-decrypt-test "mml2015")
|
|
|
|
|
|
|
|
|
|
(defvar mm-decrypt-function-alist
|
|
|
|
|
'(("application/pgp-encrypted" mml2015-decrypt "PGP" mml2015-decrypt-test)
|
|
|
|
|
("application/x-gnus-pgp-encrypted" mm-uu-pgp-encrypted-extract-1 "PGP"
|
|
|
|
|
mm-uu-pgp-encrypted-test)))
|
|
|
|
|
|
|
|
|
|
(defcustom mm-decrypt-option nil
|
|
|
|
|
"Option of decrypting encrypted parts.
|
|
|
|
|
`never', not decrypt; `always', always decrypt;
|
|
|
|
|
`known', only decrypt known protocols. Otherwise, ask user."
|
2005-02-09 15:50:47 +00:00
|
|
|
|
:version "22.1"
|
2004-09-04 13:13:48 +00:00
|
|
|
|
:type '(choice (item always)
|
|
|
|
|
(item never)
|
|
|
|
|
(item :tag "only known protocols" known)
|
|
|
|
|
(item :tag "ask" nil))
|
|
|
|
|
:group 'mime-security)
|
|
|
|
|
|
|
|
|
|
(defvar mm-viewer-completion-map
|
|
|
|
|
(let ((map (make-sparse-keymap 'mm-viewer-completion-map)))
|
|
|
|
|
(set-keymap-parent map minibuffer-local-completion-map)
|
2005-10-01 04:00:50 +00:00
|
|
|
|
;; Should we bind other key to minibuffer-complete-word?
|
|
|
|
|
(define-key map " " 'self-insert-command)
|
2004-09-04 13:13:48 +00:00
|
|
|
|
map)
|
|
|
|
|
"Keymap for input viewer with completion.")
|
|
|
|
|
|
2000-10-27 16:46:11 +00:00
|
|
|
|
(defvar mm-viewer-completion-map
|
|
|
|
|
(let ((map (make-sparse-keymap 'mm-viewer-completion-map)))
|
|
|
|
|
(set-keymap-parent map minibuffer-local-completion-map)
|
2005-10-01 04:00:50 +00:00
|
|
|
|
;; Should we bind other key to minibuffer-complete-word?
|
|
|
|
|
(define-key map " " 'self-insert-command)
|
2000-10-27 16:46:11 +00:00
|
|
|
|
map)
|
|
|
|
|
"Keymap for input viewer with completion.")
|
|
|
|
|
|
2000-09-19 13:40:08 +00:00
|
|
|
|
;;; The functions.
|
|
|
|
|
|
2004-09-04 13:13:48 +00:00
|
|
|
|
(defun mm-alist-to-plist (alist)
|
|
|
|
|
"Convert association list ALIST into the equivalent property-list form.
|
|
|
|
|
The plist is returned. This converts from
|
|
|
|
|
|
|
|
|
|
\((a . 1) (b . 2) (c . 3))
|
|
|
|
|
|
|
|
|
|
into
|
|
|
|
|
|
|
|
|
|
\(a 1 b 2 c 3)
|
|
|
|
|
|
|
|
|
|
The original alist is not modified. See also `destructive-alist-to-plist'."
|
|
|
|
|
(let (plist)
|
|
|
|
|
(while alist
|
|
|
|
|
(let ((el (car alist)))
|
|
|
|
|
(setq plist (cons (cdr el) (cons (car el) plist))))
|
|
|
|
|
(setq alist (cdr alist)))
|
|
|
|
|
(nreverse plist)))
|
|
|
|
|
|
|
|
|
|
(defun mm-keep-viewer-alive-p (handle)
|
|
|
|
|
"Say whether external viewer for HANDLE should stay alive."
|
|
|
|
|
(let ((types mm-keep-viewer-alive-types)
|
|
|
|
|
(type (mm-handle-media-type handle))
|
|
|
|
|
ty)
|
|
|
|
|
(catch 'found
|
|
|
|
|
(while (setq ty (pop types))
|
|
|
|
|
(when (string-match ty type)
|
|
|
|
|
(throw 'found t))))))
|
|
|
|
|
|
|
|
|
|
(defun mm-handle-set-external-undisplayer (handle function)
|
|
|
|
|
"Set the undisplayer for HANDLE to FUNCTION.
|
|
|
|
|
Postpone undisplaying of viewers for types in
|
|
|
|
|
`mm-keep-viewer-alive-types'."
|
|
|
|
|
(if (mm-keep-viewer-alive-p handle)
|
|
|
|
|
(let ((new-handle (copy-sequence handle)))
|
|
|
|
|
(mm-handle-set-undisplayer new-handle function)
|
|
|
|
|
(mm-handle-set-undisplayer handle nil)
|
|
|
|
|
(push new-handle mm-postponed-undisplay-list))
|
|
|
|
|
(mm-handle-set-undisplayer handle function)))
|
|
|
|
|
|
|
|
|
|
(defun mm-destroy-postponed-undisplay-list ()
|
|
|
|
|
(when mm-postponed-undisplay-list
|
|
|
|
|
(message "Destroying external MIME viewers")
|
|
|
|
|
(mm-destroy-parts mm-postponed-undisplay-list)))
|
|
|
|
|
|
Stop message.el from loading about 40 libraries it doesn't always need.
The general approach is to autoload rather than require, and to
require in the specific functions rather than the file. (Bug#5642)
* url/url.el: Move mailcap require earlier in the file.
* gnus/gmm-utils.el: Don't require wid-edit.
(widget-create-child-value, widget-convert, widget-default-get):
Autoload.
* gnus/gnus-util.el: Don't require time-date, netrc.
(message-fetch-field, gnus-group-name-decode): Declare rather than
autoloading.
(gnus-fetch-field): Require message.
(gnus-decode-newsgroups): Require gnus-group.
* gnus/ietf-drums.el: Don't require time-date.
* gnus/message.el: Don't require hashcash, canlock, ecomplete.
Do require mail-utils. Require nnheader only when compiling.
(smtpmail-default-smtp-server): Remove declaration.
(message-send-mail-function): Check smtpmail-default-smtp-server
is bound rather than requiring smtpmail.
(message-auto-save-directory, message-insert-signature): Use
expand-file-name rather than nnheader-concat.
(nnheader-insert-file-contents): Autoload.
(hashcash-wait-async): Declare.
(message-send-mail): Only call gnus-setup-posting-charset if
gnus-group-posting-charset-alist is bound. Require hashcash if needed.
(message-send-mail-with-sendmail): Require sendmail.
(canlock-password, canlock-password-for-verify): Declare.
(message-canlock-password): Require canlock.
(nnheader-get-report): Autoload.
(gnus-setup-posting-charset): Declare.
(message-send-news): Require gnus-msg.
(message-make-references, message-make-in-reply-to): Use mail-header-id
rather than the alias mail-header-message-id.
(ecomplete-add-item, ecomplete-save): Declare.
(message-put-addresses-in-ecomplete): Require ecomplete.
(ecomplete-display-matches): Autoload.
* gnus/mm-decode.el: Don't require mailcap, gnus-util.
(gnus-map-function, gnus-replace-in-string, gnus-read-shell-command)
(message-fetch-field, mailcap-parse-mailcaps, mailcap-mime-info):
Autoload.
(mailcap-mime-extensions): Declare.
* gnus/mm-encode.el: Don't require mailcap.
(mailcap-extension-to-mime): Autoload.
* gnus/mml-sec.el: Don't require password-cache.
* gnus/mml.el (gnus-setup-posting-charset): Declare rather than autoload.
(mailcap-parse-mimetypes, mailcap-mime-types): Declare.
(mml-minibuffer-read-type): Require mailcap.
(mml-preview): Require gnus-msg.
* gnus/mml1991.el: Require password-cache.
(password-cache-expiry): Remove declaration.
* gnus/mml2015.el: Require password-cache.
(password-cache-expiry): Remove declaration.
* gnus/nneething.el (mailcap): Require mailcap.
* gnus/nnheader.el: (declare-function): Add compatibility stub.
(message-remove-header): Declare rather than autoload.
(nnheader-replace-header): Require message.
* gnus/nnimap.el (declare-function): Add compatibility stub.
(netrc-parse, netrc-machine-user-or-password): Declare.
(nnimap-open-connection): Require netrc.
* gnus/nntp.el (declare-function): Add compatibility stub.
(netrc-parse, netrc-machine, netrc-get): Declare.
(nntp-send-authinfo): Require netrc.
* gnus/rfc2047.el: Don't require qp.
(quoted-printable-encode-region, quoted-printable-decode-string):
Autoload.
* gnus/sieve-mode.el: Don't require easymenu.
(easy-menu-add-item): Autoload it.
* gnus/spam-stat.el (time-to-number-of-days): Autoload it.
* password-cache.el (password-cache, password-cache-expiry):
Autoload.
2010-03-19 02:55:37 +00:00
|
|
|
|
(autoload 'message-fetch-field "message")
|
|
|
|
|
|
2005-02-28 00:04:11 +00:00
|
|
|
|
(defun mm-dissect-buffer (&optional no-strict-mime loose-mime from)
|
2000-09-19 13:40:08 +00:00
|
|
|
|
"Dissect the current buffer and return a list of MIME handles."
|
|
|
|
|
(save-excursion
|
2005-02-28 00:04:11 +00:00
|
|
|
|
(let (ct ctl type subtype cte cd description id result)
|
2000-09-19 13:40:08 +00:00
|
|
|
|
(save-restriction
|
|
|
|
|
(mail-narrow-to-head)
|
|
|
|
|
(when (or no-strict-mime
|
2004-09-04 13:13:48 +00:00
|
|
|
|
loose-mime
|
2000-09-19 13:40:08 +00:00
|
|
|
|
(mail-fetch-field "mime-version"))
|
|
|
|
|
(setq ct (mail-fetch-field "content-type")
|
2006-02-08 04:35:58 +00:00
|
|
|
|
ctl (and ct (mail-header-parse-content-type ct))
|
2000-09-19 13:40:08 +00:00
|
|
|
|
cte (mail-fetch-field "content-transfer-encoding")
|
2011-07-29 09:29:35 +00:00
|
|
|
|
cd (or (mail-fetch-field "content-disposition")
|
|
|
|
|
(when (and ctl
|
|
|
|
|
(eq 'mm-inline-text
|
|
|
|
|
(cadr (mm-assoc-string-match
|
|
|
|
|
mm-inline-media-tests
|
|
|
|
|
(car ctl)))))
|
|
|
|
|
"inline"))
|
2009-06-23 22:38:22 +00:00
|
|
|
|
;; Newlines in description should be stripped so as
|
|
|
|
|
;; not to break the MIME tag into two or more lines.
|
|
|
|
|
description (message-fetch-field "content-description")
|
2004-09-04 13:13:48 +00:00
|
|
|
|
id (mail-fetch-field "content-id"))
|
2005-02-28 00:04:11 +00:00
|
|
|
|
(unless from
|
2006-02-08 04:35:58 +00:00
|
|
|
|
(setq from (mail-fetch-field "from")))
|
2004-09-04 13:13:48 +00:00
|
|
|
|
;; FIXME: In some circumstances, this code is running within
|
|
|
|
|
;; an unibyte macro. mail-extract-address-components
|
|
|
|
|
;; creates unibyte buffers. This `if', though not a perfect
|
|
|
|
|
;; solution, avoids most of them.
|
|
|
|
|
(if from
|
2008-01-24 07:47:38 +00:00
|
|
|
|
(setq from (cadr (mail-extract-address-components from))))
|
|
|
|
|
(if description
|
|
|
|
|
(setq description (mail-decode-encoded-word-string
|
|
|
|
|
description)))))
|
2000-09-19 13:40:08 +00:00
|
|
|
|
(if (or (not ctl)
|
|
|
|
|
(not (string-match "/" (car ctl))))
|
|
|
|
|
(mm-dissect-singlepart
|
|
|
|
|
(list mm-dissect-default-type)
|
2007-10-28 09:18:39 +00:00
|
|
|
|
(and cte (intern (downcase (mail-header-strip cte))))
|
2000-09-19 13:40:08 +00:00
|
|
|
|
no-strict-mime
|
2006-02-08 04:35:58 +00:00
|
|
|
|
(and cd (mail-header-parse-content-disposition cd))
|
2000-09-19 13:40:08 +00:00
|
|
|
|
description)
|
|
|
|
|
(setq type (split-string (car ctl) "/"))
|
|
|
|
|
(setq subtype (cadr type)
|
2006-05-05 01:53:06 +00:00
|
|
|
|
type (car type))
|
2000-09-19 13:40:08 +00:00
|
|
|
|
(setq
|
|
|
|
|
result
|
|
|
|
|
(cond
|
|
|
|
|
((equal type "multipart")
|
|
|
|
|
(let ((mm-dissect-default-type (if (equal subtype "digest")
|
|
|
|
|
"message/rfc822"
|
2004-09-04 13:13:48 +00:00
|
|
|
|
"text/plain"))
|
|
|
|
|
(start (cdr (assq 'start (cdr ctl)))))
|
|
|
|
|
(add-text-properties 0 (length (car ctl))
|
|
|
|
|
(mm-alist-to-plist (cdr ctl)) (car ctl))
|
|
|
|
|
|
|
|
|
|
;; what really needs to be done here is a way to link a
|
|
|
|
|
;; MIME handle back to it's parent MIME handle (in a multilevel
|
|
|
|
|
;; MIME article). That would probably require changing
|
2005-10-01 04:00:50 +00:00
|
|
|
|
;; the mm-handle API so we simply store the multipart buffer
|
2004-09-04 13:13:48 +00:00
|
|
|
|
;; name as a text property of the "multipart/whatever" string.
|
|
|
|
|
(add-text-properties 0 (length (car ctl))
|
|
|
|
|
(list 'buffer (mm-copy-to-buffer)
|
|
|
|
|
'from from
|
|
|
|
|
'start start)
|
|
|
|
|
(car ctl))
|
2005-02-28 00:04:11 +00:00
|
|
|
|
(cons (car ctl) (mm-dissect-multipart ctl from))))
|
2000-09-19 13:40:08 +00:00
|
|
|
|
(t
|
2004-09-04 13:13:48 +00:00
|
|
|
|
(mm-possibly-verify-or-decrypt
|
|
|
|
|
(mm-dissect-singlepart
|
|
|
|
|
ctl
|
2007-10-28 09:18:39 +00:00
|
|
|
|
(and cte (intern (downcase (mail-header-strip cte))))
|
2004-09-04 13:13:48 +00:00
|
|
|
|
no-strict-mime
|
2006-02-08 04:35:58 +00:00
|
|
|
|
(and cd (mail-header-parse-content-disposition cd))
|
2004-09-04 13:13:48 +00:00
|
|
|
|
description id)
|
2010-11-11 23:51:05 +00:00
|
|
|
|
ctl from))))
|
2000-09-19 13:40:08 +00:00
|
|
|
|
(when id
|
|
|
|
|
(when (string-match " *<\\(.*\\)> *" id)
|
|
|
|
|
(setq id (match-string 1 id)))
|
|
|
|
|
(push (cons id result) mm-content-id-alist))
|
|
|
|
|
result))))
|
|
|
|
|
|
|
|
|
|
(defun mm-dissect-singlepart (ctl cte &optional force cdl description id)
|
|
|
|
|
(when (or force
|
|
|
|
|
(if (equal "text/plain" (car ctl))
|
|
|
|
|
(assoc 'format ctl)
|
|
|
|
|
t))
|
2004-09-04 13:13:48 +00:00
|
|
|
|
(mm-make-handle
|
|
|
|
|
(mm-copy-to-buffer) ctl cte nil cdl description nil id)))
|
2000-09-19 13:40:08 +00:00
|
|
|
|
|
2005-02-28 00:04:11 +00:00
|
|
|
|
(defun mm-dissect-multipart (ctl from)
|
2000-09-19 13:40:08 +00:00
|
|
|
|
(goto-char (point-min))
|
|
|
|
|
(let* ((boundary (concat "\n--" (mail-content-type-get ctl 'boundary)))
|
|
|
|
|
(close-delimiter (concat (regexp-quote boundary) "--[ \t]*$"))
|
|
|
|
|
start parts
|
|
|
|
|
(end (save-excursion
|
|
|
|
|
(goto-char (point-max))
|
|
|
|
|
(if (re-search-backward close-delimiter nil t)
|
|
|
|
|
(match-beginning 0)
|
|
|
|
|
(point-max)))))
|
|
|
|
|
(setq boundary (concat (regexp-quote boundary) "[ \t]*$"))
|
2000-12-22 14:19:33 +00:00
|
|
|
|
(while (and (< (point) end) (re-search-forward boundary end t))
|
2000-09-19 13:40:08 +00:00
|
|
|
|
(goto-char (match-beginning 0))
|
|
|
|
|
(when start
|
|
|
|
|
(save-excursion
|
|
|
|
|
(save-restriction
|
|
|
|
|
(narrow-to-region start (point))
|
2005-02-28 00:04:11 +00:00
|
|
|
|
(setq parts (nconc (list (mm-dissect-buffer t nil from)) parts)))))
|
2004-09-04 13:13:48 +00:00
|
|
|
|
(end-of-line 2)
|
|
|
|
|
(or (looking-at boundary)
|
|
|
|
|
(forward-line 1))
|
2000-09-19 13:40:08 +00:00
|
|
|
|
(setq start (point)))
|
2000-12-22 14:19:33 +00:00
|
|
|
|
(when (and start (< start end))
|
2000-09-19 13:40:08 +00:00
|
|
|
|
(save-excursion
|
|
|
|
|
(save-restriction
|
|
|
|
|
(narrow-to-region start end)
|
2005-02-28 00:04:11 +00:00
|
|
|
|
(setq parts (nconc (list (mm-dissect-buffer t nil from)) parts)))))
|
2010-11-11 23:51:05 +00:00
|
|
|
|
(mm-possibly-verify-or-decrypt (nreverse parts) ctl from)))
|
2000-09-19 13:40:08 +00:00
|
|
|
|
|
|
|
|
|
(defun mm-copy-to-buffer ()
|
|
|
|
|
"Copy the contents of the current buffer to a fresh buffer."
|
2008-03-12 18:30:52 +00:00
|
|
|
|
(let ((obuf (current-buffer))
|
2008-03-20 15:49:10 +00:00
|
|
|
|
(mb (mm-multibyte-p))
|
2008-03-12 18:30:52 +00:00
|
|
|
|
beg)
|
|
|
|
|
(goto-char (point-min))
|
|
|
|
|
(search-forward-regexp "^\n" nil t)
|
|
|
|
|
(setq beg (point))
|
2006-05-05 01:53:06 +00:00
|
|
|
|
(with-current-buffer
|
2008-03-20 15:49:10 +00:00
|
|
|
|
(generate-new-buffer " *mm*")
|
|
|
|
|
;; Preserve the data's unibyteness (for url-insert-file-contents).
|
|
|
|
|
(mm-set-buffer-multibyte mb)
|
2000-09-19 13:40:08 +00:00
|
|
|
|
(insert-buffer-substring obuf beg)
|
|
|
|
|
(current-buffer))))
|
|
|
|
|
|
2004-09-04 13:13:48 +00:00
|
|
|
|
(defun mm-display-parts (handle &optional no-default)
|
|
|
|
|
(if (stringp (car handle))
|
|
|
|
|
(mapcar 'mm-display-parts (cdr handle))
|
|
|
|
|
(if (bufferp (car handle))
|
|
|
|
|
(save-restriction
|
|
|
|
|
(narrow-to-region (point) (point))
|
|
|
|
|
(mm-display-part handle)
|
|
|
|
|
(goto-char (point-max)))
|
|
|
|
|
(mapcar 'mm-display-parts handle))))
|
|
|
|
|
|
Stop message.el from loading about 40 libraries it doesn't always need.
The general approach is to autoload rather than require, and to
require in the specific functions rather than the file. (Bug#5642)
* url/url.el: Move mailcap require earlier in the file.
* gnus/gmm-utils.el: Don't require wid-edit.
(widget-create-child-value, widget-convert, widget-default-get):
Autoload.
* gnus/gnus-util.el: Don't require time-date, netrc.
(message-fetch-field, gnus-group-name-decode): Declare rather than
autoloading.
(gnus-fetch-field): Require message.
(gnus-decode-newsgroups): Require gnus-group.
* gnus/ietf-drums.el: Don't require time-date.
* gnus/message.el: Don't require hashcash, canlock, ecomplete.
Do require mail-utils. Require nnheader only when compiling.
(smtpmail-default-smtp-server): Remove declaration.
(message-send-mail-function): Check smtpmail-default-smtp-server
is bound rather than requiring smtpmail.
(message-auto-save-directory, message-insert-signature): Use
expand-file-name rather than nnheader-concat.
(nnheader-insert-file-contents): Autoload.
(hashcash-wait-async): Declare.
(message-send-mail): Only call gnus-setup-posting-charset if
gnus-group-posting-charset-alist is bound. Require hashcash if needed.
(message-send-mail-with-sendmail): Require sendmail.
(canlock-password, canlock-password-for-verify): Declare.
(message-canlock-password): Require canlock.
(nnheader-get-report): Autoload.
(gnus-setup-posting-charset): Declare.
(message-send-news): Require gnus-msg.
(message-make-references, message-make-in-reply-to): Use mail-header-id
rather than the alias mail-header-message-id.
(ecomplete-add-item, ecomplete-save): Declare.
(message-put-addresses-in-ecomplete): Require ecomplete.
(ecomplete-display-matches): Autoload.
* gnus/mm-decode.el: Don't require mailcap, gnus-util.
(gnus-map-function, gnus-replace-in-string, gnus-read-shell-command)
(message-fetch-field, mailcap-parse-mailcaps, mailcap-mime-info):
Autoload.
(mailcap-mime-extensions): Declare.
* gnus/mm-encode.el: Don't require mailcap.
(mailcap-extension-to-mime): Autoload.
* gnus/mml-sec.el: Don't require password-cache.
* gnus/mml.el (gnus-setup-posting-charset): Declare rather than autoload.
(mailcap-parse-mimetypes, mailcap-mime-types): Declare.
(mml-minibuffer-read-type): Require mailcap.
(mml-preview): Require gnus-msg.
* gnus/mml1991.el: Require password-cache.
(password-cache-expiry): Remove declaration.
* gnus/mml2015.el: Require password-cache.
(password-cache-expiry): Remove declaration.
* gnus/nneething.el (mailcap): Require mailcap.
* gnus/nnheader.el: (declare-function): Add compatibility stub.
(message-remove-header): Declare rather than autoload.
(nnheader-replace-header): Require message.
* gnus/nnimap.el (declare-function): Add compatibility stub.
(netrc-parse, netrc-machine-user-or-password): Declare.
(nnimap-open-connection): Require netrc.
* gnus/nntp.el (declare-function): Add compatibility stub.
(netrc-parse, netrc-machine, netrc-get): Declare.
(nntp-send-authinfo): Require netrc.
* gnus/rfc2047.el: Don't require qp.
(quoted-printable-encode-region, quoted-printable-decode-string):
Autoload.
* gnus/sieve-mode.el: Don't require easymenu.
(easy-menu-add-item): Autoload it.
* gnus/spam-stat.el (time-to-number-of-days): Autoload it.
* password-cache.el (password-cache, password-cache-expiry):
Autoload.
2010-03-19 02:55:37 +00:00
|
|
|
|
(autoload 'mailcap-parse-mailcaps "mailcap")
|
|
|
|
|
(autoload 'mailcap-mime-info "mailcap")
|
|
|
|
|
|
2010-10-28 06:37:35 +00:00
|
|
|
|
(defun mm-display-part (handle &optional no-default force)
|
2000-09-19 13:40:08 +00:00
|
|
|
|
"Display the MIME part represented by HANDLE.
|
|
|
|
|
Returns nil if the part is removed; inline if displayed inline;
|
|
|
|
|
external if displayed external."
|
|
|
|
|
(save-excursion
|
|
|
|
|
(mailcap-parse-mailcaps)
|
2010-10-28 06:37:35 +00:00
|
|
|
|
(if (and (not force)
|
|
|
|
|
(mm-handle-displayed-p handle))
|
2000-09-19 13:40:08 +00:00
|
|
|
|
(mm-remove-part handle)
|
2006-04-12 05:23:27 +00:00
|
|
|
|
(let* ((ehandle (if (equal (mm-handle-media-type handle)
|
|
|
|
|
"message/external-body")
|
|
|
|
|
(progn
|
|
|
|
|
(unless (mm-handle-cache handle)
|
|
|
|
|
(mm-extern-cache-contents handle))
|
|
|
|
|
(mm-handle-cache handle))
|
|
|
|
|
handle))
|
|
|
|
|
(type (mm-handle-media-type ehandle))
|
2004-09-04 13:13:48 +00:00
|
|
|
|
(method (mailcap-mime-info type))
|
|
|
|
|
(filename (or (mail-content-type-get
|
|
|
|
|
(mm-handle-disposition handle) 'filename)
|
|
|
|
|
(mail-content-type-get
|
|
|
|
|
(mm-handle-type handle) 'name)
|
|
|
|
|
"<file>"))
|
|
|
|
|
(external mm-enable-external))
|
2006-04-12 05:23:27 +00:00
|
|
|
|
(if (and (mm-inlinable-p ehandle)
|
|
|
|
|
(mm-inlined-p ehandle))
|
2000-09-19 13:40:08 +00:00
|
|
|
|
(progn
|
|
|
|
|
(forward-line 1)
|
|
|
|
|
(mm-display-inline handle)
|
|
|
|
|
'inline)
|
|
|
|
|
(when (or method
|
|
|
|
|
(not no-default))
|
|
|
|
|
(if (and (not method)
|
2006-04-12 05:23:27 +00:00
|
|
|
|
(equal "text" (car (split-string type "/"))))
|
2000-09-19 13:40:08 +00:00
|
|
|
|
(progn
|
|
|
|
|
(forward-line 1)
|
|
|
|
|
(mm-insert-inline handle (mm-get-part handle))
|
|
|
|
|
'inline)
|
2006-05-05 01:53:06 +00:00
|
|
|
|
(setq external
|
|
|
|
|
(and method ;; If nil, we always use "save".
|
2004-09-04 13:13:48 +00:00
|
|
|
|
(stringp method) ;; 'mailcap-save-binary-file
|
|
|
|
|
(or (eq mm-enable-external t)
|
|
|
|
|
(and (eq mm-enable-external 'ask)
|
|
|
|
|
(y-or-n-p
|
|
|
|
|
(concat
|
|
|
|
|
"Display part (" type
|
|
|
|
|
") using external program"
|
|
|
|
|
;; Can non-string method ever happen?
|
|
|
|
|
(if (stringp method)
|
|
|
|
|
(concat
|
|
|
|
|
" \"" (format method filename) "\"")
|
|
|
|
|
"")
|
2006-05-05 01:53:06 +00:00
|
|
|
|
"? "))))))
|
2004-09-04 13:13:48 +00:00
|
|
|
|
(if external
|
|
|
|
|
(mm-display-external
|
|
|
|
|
handle (or method 'mailcap-save-binary-file))
|
|
|
|
|
(mm-display-external
|
|
|
|
|
handle 'mailcap-save-binary-file)))))))))
|
2000-09-19 13:40:08 +00:00
|
|
|
|
|
2007-12-11 05:41:13 +00:00
|
|
|
|
(declare-function gnus-configure-windows "gnus-win" (setting &optional force))
|
Stop message.el from loading about 40 libraries it doesn't always need.
The general approach is to autoload rather than require, and to
require in the specific functions rather than the file. (Bug#5642)
* url/url.el: Move mailcap require earlier in the file.
* gnus/gmm-utils.el: Don't require wid-edit.
(widget-create-child-value, widget-convert, widget-default-get):
Autoload.
* gnus/gnus-util.el: Don't require time-date, netrc.
(message-fetch-field, gnus-group-name-decode): Declare rather than
autoloading.
(gnus-fetch-field): Require message.
(gnus-decode-newsgroups): Require gnus-group.
* gnus/ietf-drums.el: Don't require time-date.
* gnus/message.el: Don't require hashcash, canlock, ecomplete.
Do require mail-utils. Require nnheader only when compiling.
(smtpmail-default-smtp-server): Remove declaration.
(message-send-mail-function): Check smtpmail-default-smtp-server
is bound rather than requiring smtpmail.
(message-auto-save-directory, message-insert-signature): Use
expand-file-name rather than nnheader-concat.
(nnheader-insert-file-contents): Autoload.
(hashcash-wait-async): Declare.
(message-send-mail): Only call gnus-setup-posting-charset if
gnus-group-posting-charset-alist is bound. Require hashcash if needed.
(message-send-mail-with-sendmail): Require sendmail.
(canlock-password, canlock-password-for-verify): Declare.
(message-canlock-password): Require canlock.
(nnheader-get-report): Autoload.
(gnus-setup-posting-charset): Declare.
(message-send-news): Require gnus-msg.
(message-make-references, message-make-in-reply-to): Use mail-header-id
rather than the alias mail-header-message-id.
(ecomplete-add-item, ecomplete-save): Declare.
(message-put-addresses-in-ecomplete): Require ecomplete.
(ecomplete-display-matches): Autoload.
* gnus/mm-decode.el: Don't require mailcap, gnus-util.
(gnus-map-function, gnus-replace-in-string, gnus-read-shell-command)
(message-fetch-field, mailcap-parse-mailcaps, mailcap-mime-info):
Autoload.
(mailcap-mime-extensions): Declare.
* gnus/mm-encode.el: Don't require mailcap.
(mailcap-extension-to-mime): Autoload.
* gnus/mml-sec.el: Don't require password-cache.
* gnus/mml.el (gnus-setup-posting-charset): Declare rather than autoload.
(mailcap-parse-mimetypes, mailcap-mime-types): Declare.
(mml-minibuffer-read-type): Require mailcap.
(mml-preview): Require gnus-msg.
* gnus/mml1991.el: Require password-cache.
(password-cache-expiry): Remove declaration.
* gnus/mml2015.el: Require password-cache.
(password-cache-expiry): Remove declaration.
* gnus/nneething.el (mailcap): Require mailcap.
* gnus/nnheader.el: (declare-function): Add compatibility stub.
(message-remove-header): Declare rather than autoload.
(nnheader-replace-header): Require message.
* gnus/nnimap.el (declare-function): Add compatibility stub.
(netrc-parse, netrc-machine-user-or-password): Declare.
(nnimap-open-connection): Require netrc.
* gnus/nntp.el (declare-function): Add compatibility stub.
(netrc-parse, netrc-machine, netrc-get): Declare.
(nntp-send-authinfo): Require netrc.
* gnus/rfc2047.el: Don't require qp.
(quoted-printable-encode-region, quoted-printable-decode-string):
Autoload.
* gnus/sieve-mode.el: Don't require easymenu.
(easy-menu-add-item): Autoload it.
* gnus/spam-stat.el (time-to-number-of-days): Autoload it.
* password-cache.el (password-cache, password-cache-expiry):
Autoload.
2010-03-19 02:55:37 +00:00
|
|
|
|
(defvar mailcap-mime-extensions) ; mailcap-mime-info autoloads
|
2007-12-11 05:41:13 +00:00
|
|
|
|
|
2000-09-19 13:40:08 +00:00
|
|
|
|
(defun mm-display-external (handle method)
|
|
|
|
|
"Display HANDLE using METHOD."
|
|
|
|
|
(let ((outbuf (current-buffer)))
|
|
|
|
|
(mm-with-unibyte-buffer
|
|
|
|
|
(if (functionp method)
|
|
|
|
|
(let ((cur (current-buffer)))
|
|
|
|
|
(if (eq method 'mailcap-save-binary-file)
|
|
|
|
|
(progn
|
2000-11-03 15:51:16 +00:00
|
|
|
|
(set-buffer (generate-new-buffer " *mm*"))
|
2000-09-19 13:40:08 +00:00
|
|
|
|
(setq method nil))
|
|
|
|
|
(mm-insert-part handle)
|
2007-12-28 22:26:31 +00:00
|
|
|
|
(mm-add-meta-html-tag handle)
|
2000-09-19 13:40:08 +00:00
|
|
|
|
(let ((win (get-buffer-window cur t)))
|
|
|
|
|
(when win
|
|
|
|
|
(select-window win)))
|
2000-11-03 15:51:16 +00:00
|
|
|
|
(switch-to-buffer (generate-new-buffer " *mm*")))
|
2004-09-04 13:13:48 +00:00
|
|
|
|
(buffer-disable-undo)
|
2000-09-19 13:40:08 +00:00
|
|
|
|
(mm-set-buffer-file-coding-system mm-binary-coding-system)
|
|
|
|
|
(insert-buffer-substring cur)
|
|
|
|
|
(goto-char (point-min))
|
2004-09-04 13:13:48 +00:00
|
|
|
|
(when method
|
|
|
|
|
(message "Viewing with %s" method))
|
2000-09-19 13:40:08 +00:00
|
|
|
|
(let ((mm (current-buffer))
|
|
|
|
|
(non-viewer (assq 'non-viewer
|
|
|
|
|
(mailcap-mime-info
|
|
|
|
|
(mm-handle-media-type handle) t))))
|
|
|
|
|
(unwind-protect
|
|
|
|
|
(if method
|
|
|
|
|
(funcall method)
|
|
|
|
|
(mm-save-part handle))
|
|
|
|
|
(when (and (not non-viewer)
|
|
|
|
|
method)
|
|
|
|
|
(mm-handle-set-undisplayer handle mm)))))
|
|
|
|
|
;; The function is a string to be executed.
|
|
|
|
|
(mm-insert-part handle)
|
2007-12-28 22:26:31 +00:00
|
|
|
|
(mm-add-meta-html-tag handle)
|
2004-09-04 13:13:48 +00:00
|
|
|
|
(let* ((dir (mm-make-temp-file
|
2002-03-21 19:11:23 +00:00
|
|
|
|
(expand-file-name "emm." mm-tmp-directory) 'dir))
|
2004-09-04 13:13:48 +00:00
|
|
|
|
(filename (or
|
|
|
|
|
(mail-content-type-get
|
|
|
|
|
(mm-handle-disposition handle) 'filename)
|
|
|
|
|
(mail-content-type-get
|
|
|
|
|
(mm-handle-type handle) 'name)))
|
2000-09-19 13:40:08 +00:00
|
|
|
|
(mime-info (mailcap-mime-info
|
|
|
|
|
(mm-handle-media-type handle) t))
|
|
|
|
|
(needsterm (or (assoc "needsterm" mime-info)
|
|
|
|
|
(assoc "needsterminal" mime-info)))
|
|
|
|
|
(copiousoutput (assoc "copiousoutput" mime-info))
|
|
|
|
|
file buffer)
|
|
|
|
|
;; We create a private sub-directory where we store our files.
|
2008-04-21 07:13:33 +00:00
|
|
|
|
(set-file-modes dir #o700)
|
2000-09-19 13:40:08 +00:00
|
|
|
|
(if filename
|
2004-09-04 13:13:48 +00:00
|
|
|
|
(setq file (expand-file-name
|
|
|
|
|
(gnus-map-function mm-file-name-rewrite-functions
|
|
|
|
|
(file-name-nondirectory filename))
|
|
|
|
|
dir))
|
2006-02-17 00:24:04 +00:00
|
|
|
|
;; Use nametemplate (defined in RFC1524) if it is specified
|
|
|
|
|
;; in mailcap.
|
|
|
|
|
(let ((suffix (cdr (assoc "nametemplate" mime-info))))
|
|
|
|
|
(if (and suffix
|
|
|
|
|
(string-match "\\`%s\\(\\..+\\)\\'" suffix))
|
|
|
|
|
(setq suffix (match-string 1 suffix))
|
|
|
|
|
;; Otherwise, use a suffix according to
|
|
|
|
|
;; `mailcap-mime-extensions'.
|
|
|
|
|
(setq suffix (car (rassoc (mm-handle-media-type handle)
|
|
|
|
|
mailcap-mime-extensions))))
|
|
|
|
|
(setq file (mm-make-temp-file (expand-file-name "mm." dir)
|
|
|
|
|
nil suffix))))
|
2000-09-19 13:40:08 +00:00
|
|
|
|
(let ((coding-system-for-write mm-binary-coding-system))
|
|
|
|
|
(write-region (point-min) (point-max) file nil 'nomesg))
|
2008-04-21 07:13:33 +00:00
|
|
|
|
;; The file is deleted after the viewer exists. If the users edits
|
|
|
|
|
;; the file, changes will be lost. Set file to read-only to make it
|
|
|
|
|
;; clear.
|
|
|
|
|
(set-file-modes file #o400)
|
2000-09-19 13:40:08 +00:00
|
|
|
|
(message "Viewing with %s" method)
|
2004-09-04 13:13:48 +00:00
|
|
|
|
(cond
|
|
|
|
|
(needsterm
|
|
|
|
|
(let ((command (mm-mailcap-command
|
|
|
|
|
method file (mm-handle-type handle))))
|
|
|
|
|
(unwind-protect
|
|
|
|
|
(if window-system
|
|
|
|
|
(start-process "*display*" nil
|
|
|
|
|
mm-external-terminal-program
|
|
|
|
|
"-e" shell-file-name
|
|
|
|
|
shell-command-switch command)
|
|
|
|
|
(require 'term)
|
|
|
|
|
(require 'gnus-win)
|
|
|
|
|
(set-buffer
|
|
|
|
|
(setq buffer
|
|
|
|
|
(make-term "display"
|
|
|
|
|
shell-file-name
|
|
|
|
|
nil
|
|
|
|
|
shell-command-switch command)))
|
|
|
|
|
(term-mode)
|
|
|
|
|
(term-char-mode)
|
|
|
|
|
(set-process-sentinel
|
|
|
|
|
(get-buffer-process buffer)
|
|
|
|
|
`(lambda (process state)
|
|
|
|
|
(if (eq 'exit (process-status process))
|
|
|
|
|
(gnus-configure-windows
|
|
|
|
|
',gnus-current-window-configuration))))
|
|
|
|
|
(gnus-configure-windows 'display-term))
|
|
|
|
|
(mm-handle-set-external-undisplayer handle (cons file buffer)))
|
|
|
|
|
(message "Displaying %s..." command))
|
|
|
|
|
'external)
|
|
|
|
|
(copiousoutput
|
|
|
|
|
(with-current-buffer outbuf
|
|
|
|
|
(forward-line 1)
|
|
|
|
|
(mm-insert-inline
|
|
|
|
|
handle
|
|
|
|
|
(unwind-protect
|
|
|
|
|
(progn
|
|
|
|
|
(call-process shell-file-name nil
|
|
|
|
|
(setq buffer
|
|
|
|
|
(generate-new-buffer " *mm*"))
|
|
|
|
|
nil
|
|
|
|
|
shell-command-switch
|
|
|
|
|
(mm-mailcap-command
|
|
|
|
|
method file (mm-handle-type handle)))
|
|
|
|
|
(if (buffer-live-p buffer)
|
2005-10-01 04:00:50 +00:00
|
|
|
|
(with-current-buffer buffer
|
2004-09-04 13:13:48 +00:00
|
|
|
|
(buffer-string))))
|
|
|
|
|
(progn
|
|
|
|
|
(ignore-errors (delete-file file))
|
|
|
|
|
(ignore-errors (delete-directory
|
|
|
|
|
(file-name-directory file)))
|
|
|
|
|
(ignore-errors (kill-buffer buffer))))))
|
|
|
|
|
'inline)
|
|
|
|
|
(t
|
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
|
|
|
|
;; Deleting the temp file should be postponed for some wrappers,
|
|
|
|
|
;; shell scripts, and so on, which might exit right after having
|
|
|
|
|
;; started a viewer command as a background job.
|
2004-09-04 13:13:48 +00:00
|
|
|
|
(let ((command (mm-mailcap-command
|
|
|
|
|
method file (mm-handle-type handle))))
|
|
|
|
|
(unwind-protect
|
2005-07-31 00:12:23 +00:00
|
|
|
|
(progn
|
|
|
|
|
(start-process "*display*"
|
|
|
|
|
(setq buffer
|
|
|
|
|
(generate-new-buffer " *mm*"))
|
|
|
|
|
shell-file-name
|
|
|
|
|
shell-command-switch command)
|
|
|
|
|
(set-process-sentinel
|
|
|
|
|
(get-buffer-process buffer)
|
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
|
|
|
|
(lexical-let ;; Don't use `let'.
|
|
|
|
|
;; Function used to remove temp file and directory.
|
|
|
|
|
((fn `(lambda nil
|
|
|
|
|
;; Don't use `ignore-errors'.
|
|
|
|
|
(condition-case nil
|
|
|
|
|
(delete-file ,file)
|
|
|
|
|
(error))
|
|
|
|
|
(condition-case nil
|
|
|
|
|
(delete-directory
|
|
|
|
|
,(file-name-directory file))
|
|
|
|
|
(error))))
|
|
|
|
|
;; Form uses to kill the process buffer and
|
|
|
|
|
;; remove the undisplayer.
|
|
|
|
|
(fm `(progn
|
|
|
|
|
(kill-buffer ,buffer)
|
|
|
|
|
,(macroexpand
|
|
|
|
|
(list 'mm-handle-set-undisplayer
|
|
|
|
|
(list 'quote handle)
|
|
|
|
|
nil))))
|
|
|
|
|
;; Message to be issued when the process exits.
|
|
|
|
|
(done (format "Displaying %s...done" command))
|
|
|
|
|
;; In particular, the timer object (which is
|
|
|
|
|
;; a vector in Emacs but is a list in XEmacs)
|
|
|
|
|
;; requires that it is lexically scoped.
|
2012-01-07 01:13:52 +00:00
|
|
|
|
(timer (run-at-time 30.0 nil 'ignore)))
|
* smime.el (from):
* rfc2047.el (message-posting-charset):
* qp.el (mm-use-ultra-safe-encoding):
* pop3.el (parse-time-months):
* nnrss.el (mm-text-html-renderer, mm-text-html-washer-alist):
* nnml.el (files):
* nnheader.el (gnus-newsgroup-name, nnheader-file-coding-system)
(jka-compr-compression-info-list, ange-ftp-path-format)
(efs-path-regexp):
* nndiary.el (files):
* mml2015.el (mc-default-scheme, mc-schemes, pgg-default-user-id)
(pgg-errors-buffer, pgg-output-buffer, epg-user-id-alist)
(epg-digest-algorithm-alist, inhibit-redisplay)
(password-cache-expiry):
* mml1991.el (pgg-default-user-id, pgg-errors-buffer)
(pgg-output-buffer, password-cache-expiry):
* mml.el (mml-dnd-protocol-alist, ange-ftp-name-format)
(efs-path-regexp):
* mml-smime.el (epg-user-id-alist, epg-digest-algorithm-alist)
(inhibit-redisplay):
* mm-uu.el (file-name, start-point, end-point, entry)
(gnus-newsgroup-name, gnus-newsgroup-charset):
* mm-util.el (mm-mime-mule-charset-alist, latin-unity-coding-systems)
(latin-unity-ucs-list):
* mm-bodies.el (mm-uu-yenc-decode-function, mm-uu-decode-function)
(mm-uu-binhex-decode-function):
* message.el (gnus-message-group-art, gnus-list-identifiers, )
(rmail-enable-mime-composing, gnus-local-organization)
(gnus-post-method, gnus-select-method, gnus-active-hashtb)
(gnus-read-active-file, facemenu-add-face-function)
(facemenu-remove-face-function, gnus-article-decoded-p)
(tool-bar-mode):
* mail-source.el (display-time-mail-function):
* gnus-util.el (nnmail-pathname-coding-system)
(nnmail-active-file-coding-system, gnus-emphasize-whitespace-regexp)
(gnus-original-article-buffer, gnus-user-agent)
(rmail-default-rmail-file, mm-text-coding-system, tool-bar-mode)
(xemacs-codename, sxemacs-codename, emacs-program-version):
* gnus-sum.el (tool-bar-mode, gnus-tmp-header, number):
* gnus-start.el (gnus-agent-covered-methods)
(gnus-agent-file-loading-local, gnus-agent-file-loading-cache)
(gnus-current-headers, gnus-thread-indent-array, gnus-newsgroup-name)
(gnus-newsgroup-headers, gnus-group-list-mode)
(gnus-group-mark-positions, gnus-newsgroup-data)
(gnus-newsgroup-unreads, nnoo-state-alist)
(gnus-current-select-method, mail-sources)
(nnmail-scan-directory-mail-source-once, nnmail-split-history)
(nnmail-spool-file, gnus-cache-active-hashtb):
* gnus-mh.el (mh-lib-progs):
* gnus-ems.el (gnus-tmp-unread, gnus-tmp-replied)
(gnus-tmp-score-char, gnus-tmp-indentation, gnus-tmp-opening-bracket)
(gnus-tmp-lines, gnus-tmp-name, gnus-tmp-closing-bracket)
(gnus-tmp-subject-or-nil, gnus-check-before-posting, gnus-mouse-face)
(gnus-group-buffer):
* gnus-cite.el (font-lock-defaults-computed, font-lock-keywords)
(font-lock-set-defaults):
* gnus-art.el (tool-bar-map, w3m-minor-mode-map)
(gnus-face-properties-alist, charset, gnus-summary-article-menu)
(gnus-summary-post-menu, total-parts, type, condition, length):
* gnus-agent.el (gnus-agent-read-agentview):
* flow-fill.el (show-trailing-whitespace):
* gnus-group.el (tool-bar-mode, nnrss-group-alist): Remove unnecessary
eval-and-compile wrappers for byte compiler pacifiers.
* mm-view.el (mm-inline-image-xemacs): Only do something for XEmacs.
(mm-display-inline-fontify): Check for featurep 'xemacs not
extent-list.
* mm-decode.el (mm-display-external): Check for featurep 'xemacs not
itimer-list.
(mm-create-image-xemacs): Only do something for XEmacs.
(mm-image-fit-p): Check for featurep 'xemacs not glyph-width.
* mm-util.el (mm-find-buffer-file-coding-system): Add check for XEmacs.
* gnus-registry.el (gnus-adaptive-word-syntax-table):
* gnus-fun.el (gnus-face-properties-alist): Pacify byte compiler.
* textmodes/reftex-dcr.el (reftex-start-itimer-once): Add check
for XEmacs.
* calc/calc-menu.el (calc-mode-map): Pacify byte compiler.
* doc-view.el (doc-view-resolution): Add missing :group.
2007-11-16 16:50:35 +00:00
|
|
|
|
(if (featurep 'xemacs)
|
2007-01-09 05:40:39 +00:00
|
|
|
|
(lambda (process state)
|
|
|
|
|
(when (eq 'exit (process-status process))
|
|
|
|
|
(if (memq timer itimer-list)
|
|
|
|
|
(set-itimer-function timer fn)
|
|
|
|
|
(funcall fn))
|
|
|
|
|
(ignore-errors (eval fm))
|
|
|
|
|
(message "%s" done)))
|
|
|
|
|
(lambda (process state)
|
|
|
|
|
(when (eq 'exit (process-status process))
|
|
|
|
|
(if (memq timer timer-list)
|
|
|
|
|
(timer-set-function timer fn)
|
|
|
|
|
(funcall fn))
|
|
|
|
|
(ignore-errors (eval fm))
|
|
|
|
|
(message "%s" done)))))))
|
2004-09-04 13:13:48 +00:00
|
|
|
|
(mm-handle-set-external-undisplayer
|
|
|
|
|
handle (cons file buffer)))
|
|
|
|
|
(message "Displaying %s..." command))
|
|
|
|
|
'external)))))))
|
2003-02-04 13:24:35 +00:00
|
|
|
|
|
2000-09-19 13:40:08 +00:00
|
|
|
|
(defun mm-mailcap-command (method file type-list)
|
|
|
|
|
(let ((ctl (cdr type-list))
|
|
|
|
|
(beg 0)
|
|
|
|
|
(uses-stdin t)
|
|
|
|
|
out sub total)
|
2004-09-04 13:13:48 +00:00
|
|
|
|
(while (string-match "%{\\([^}]+\\)}\\|'%s'\\|\"%s\"\\|%s\\|%t\\|%%"
|
|
|
|
|
method beg)
|
2000-09-19 13:40:08 +00:00
|
|
|
|
(push (substring method beg (match-beginning 0)) out)
|
|
|
|
|
(setq beg (match-end 0)
|
|
|
|
|
total (match-string 0 method)
|
|
|
|
|
sub (match-string 1 method))
|
|
|
|
|
(cond
|
|
|
|
|
((string= total "%%")
|
|
|
|
|
(push "%" out))
|
2004-09-04 13:13:48 +00:00
|
|
|
|
((or (string= total "%s")
|
|
|
|
|
;; We do our own quoting.
|
|
|
|
|
(string= total "'%s'")
|
|
|
|
|
(string= total "\"%s\""))
|
2000-09-19 13:40:08 +00:00
|
|
|
|
(setq uses-stdin nil)
|
2007-10-28 09:18:39 +00:00
|
|
|
|
(push (shell-quote-argument
|
2004-09-04 13:13:48 +00:00
|
|
|
|
(gnus-map-function mm-path-name-rewrite-functions file)) out))
|
2000-09-19 13:40:08 +00:00
|
|
|
|
((string= total "%t")
|
2007-10-28 09:18:39 +00:00
|
|
|
|
(push (shell-quote-argument (car type-list)) out))
|
2000-09-19 13:40:08 +00:00
|
|
|
|
(t
|
2007-10-28 09:18:39 +00:00
|
|
|
|
(push (shell-quote-argument (or (cdr (assq (intern sub) ctl)) "")) out))))
|
2000-09-19 13:40:08 +00:00
|
|
|
|
(push (substring method beg (length method)) out)
|
2004-09-04 13:13:48 +00:00
|
|
|
|
(when uses-stdin
|
|
|
|
|
(push "<" out)
|
2007-10-28 09:18:39 +00:00
|
|
|
|
(push (shell-quote-argument
|
2004-09-04 13:13:48 +00:00
|
|
|
|
(gnus-map-function mm-path-name-rewrite-functions file))
|
|
|
|
|
out))
|
2000-09-19 13:40:08 +00:00
|
|
|
|
(mapconcat 'identity (nreverse out) "")))
|
2003-02-04 13:24:35 +00:00
|
|
|
|
|
2000-09-19 13:40:08 +00:00
|
|
|
|
(defun mm-remove-parts (handles)
|
|
|
|
|
"Remove the displayed MIME parts represented by HANDLES."
|
|
|
|
|
(if (and (listp handles)
|
|
|
|
|
(bufferp (car handles)))
|
|
|
|
|
(mm-remove-part handles)
|
|
|
|
|
(let (handle)
|
|
|
|
|
(while (setq handle (pop handles))
|
|
|
|
|
(cond
|
|
|
|
|
((stringp handle)
|
2004-09-04 13:13:48 +00:00
|
|
|
|
(when (buffer-live-p (get-text-property 0 'buffer handle))
|
|
|
|
|
(kill-buffer (get-text-property 0 'buffer handle))))
|
2000-09-19 13:40:08 +00:00
|
|
|
|
((and (listp handle)
|
|
|
|
|
(stringp (car handle)))
|
|
|
|
|
(mm-remove-parts (cdr handle)))
|
|
|
|
|
(t
|
|
|
|
|
(mm-remove-part handle)))))))
|
|
|
|
|
|
|
|
|
|
(defun mm-destroy-parts (handles)
|
|
|
|
|
"Remove the displayed MIME parts represented by HANDLES."
|
|
|
|
|
(if (and (listp handles)
|
|
|
|
|
(bufferp (car handles)))
|
|
|
|
|
(mm-destroy-part handles)
|
|
|
|
|
(let (handle)
|
|
|
|
|
(while (setq handle (pop handles))
|
|
|
|
|
(cond
|
|
|
|
|
((stringp handle)
|
2004-09-04 13:13:48 +00:00
|
|
|
|
(when (buffer-live-p (get-text-property 0 'buffer handle))
|
|
|
|
|
(kill-buffer (get-text-property 0 'buffer handle))))
|
2000-09-19 13:40:08 +00:00
|
|
|
|
((and (listp handle)
|
|
|
|
|
(stringp (car handle)))
|
2004-09-04 13:13:48 +00:00
|
|
|
|
(mm-destroy-parts handle))
|
2000-09-19 13:40:08 +00:00
|
|
|
|
(t
|
|
|
|
|
(mm-destroy-part handle)))))))
|
|
|
|
|
|
|
|
|
|
(defun mm-remove-part (handle)
|
|
|
|
|
"Remove the displayed MIME part represented by HANDLE."
|
|
|
|
|
(when (listp handle)
|
|
|
|
|
(let ((object (mm-handle-undisplayer handle)))
|
|
|
|
|
(ignore-errors
|
|
|
|
|
(cond
|
|
|
|
|
;; Internally displayed part.
|
|
|
|
|
((mm-annotationp object)
|
2007-12-11 05:41:13 +00:00
|
|
|
|
(if (featurep 'xemacs)
|
|
|
|
|
(delete-annotation object)))
|
2000-09-19 13:40:08 +00:00
|
|
|
|
((or (functionp object)
|
|
|
|
|
(and (listp object)
|
|
|
|
|
(eq (car object) 'lambda)))
|
|
|
|
|
(funcall object))
|
|
|
|
|
;; Externally displayed part.
|
|
|
|
|
((consp object)
|
2004-09-04 13:13:48 +00:00
|
|
|
|
(condition-case ()
|
|
|
|
|
(while (get-buffer-process (cdr object))
|
|
|
|
|
(interrupt-process (get-buffer-process (cdr object)))
|
|
|
|
|
(message "Waiting for external displayer to die...")
|
|
|
|
|
(sit-for 1))
|
|
|
|
|
(quit)
|
|
|
|
|
(error))
|
|
|
|
|
(ignore-errors (and (cdr object) (kill-buffer (cdr object))))
|
|
|
|
|
(message "Waiting for external displayer to die...done")
|
2000-09-19 13:40:08 +00:00
|
|
|
|
(ignore-errors (delete-file (car object)))
|
2004-09-04 13:13:48 +00:00
|
|
|
|
(ignore-errors (delete-directory (file-name-directory
|
|
|
|
|
(car object)))))
|
2000-09-19 13:40:08 +00:00
|
|
|
|
((bufferp object)
|
|
|
|
|
(when (buffer-live-p object)
|
|
|
|
|
(kill-buffer object)))))
|
|
|
|
|
(mm-handle-set-undisplayer handle nil))))
|
|
|
|
|
|
|
|
|
|
(defun mm-display-inline (handle)
|
|
|
|
|
(let* ((type (mm-handle-media-type handle))
|
|
|
|
|
(function (cadr (mm-assoc-string-match mm-inline-media-tests type))))
|
|
|
|
|
(funcall function handle)
|
|
|
|
|
(goto-char (point-min))))
|
|
|
|
|
|
|
|
|
|
(defun mm-assoc-string-match (alist type)
|
|
|
|
|
(dolist (elem alist)
|
|
|
|
|
(when (string-match (car elem) type)
|
|
|
|
|
(return elem))))
|
|
|
|
|
|
2004-09-04 13:13:48 +00:00
|
|
|
|
(defun mm-automatic-display-p (handle)
|
|
|
|
|
"Say whether the user wants HANDLE to be displayed automatically."
|
|
|
|
|
(let ((methods mm-automatic-display)
|
|
|
|
|
(type (mm-handle-media-type handle))
|
|
|
|
|
method result)
|
|
|
|
|
(while (setq method (pop methods))
|
|
|
|
|
(when (and (not (mm-inline-override-p handle))
|
|
|
|
|
(string-match method type))
|
|
|
|
|
(setq result t
|
|
|
|
|
methods nil)))
|
|
|
|
|
result))
|
|
|
|
|
|
2006-05-05 01:53:06 +00:00
|
|
|
|
(defun mm-inlinable-p (handle &optional type)
|
|
|
|
|
"Say whether HANDLE can be displayed inline.
|
|
|
|
|
TYPE is the mime-type of the object; it defaults to the one given
|
|
|
|
|
in HANDLE."
|
|
|
|
|
(unless type (setq type (mm-handle-media-type handle)))
|
2000-09-19 13:40:08 +00:00
|
|
|
|
(let ((alist mm-inline-media-tests)
|
|
|
|
|
test)
|
|
|
|
|
(while alist
|
|
|
|
|
(when (string-match (caar alist) type)
|
|
|
|
|
(setq test (caddar alist)
|
|
|
|
|
alist nil)
|
|
|
|
|
(setq test (funcall test handle)))
|
|
|
|
|
(pop alist))
|
|
|
|
|
test))
|
|
|
|
|
|
|
|
|
|
(defun mm-inlined-p (handle)
|
2004-09-04 13:13:48 +00:00
|
|
|
|
"Say whether the user wants HANDLE to be displayed inline."
|
2000-09-19 13:40:08 +00:00
|
|
|
|
(let ((methods mm-inlined-types)
|
|
|
|
|
(type (mm-handle-media-type handle))
|
|
|
|
|
method result)
|
|
|
|
|
(while (setq method (pop methods))
|
|
|
|
|
(when (and (not (mm-inline-override-p handle))
|
2004-09-04 13:13:48 +00:00
|
|
|
|
(string-match method type))
|
2000-09-19 13:40:08 +00:00
|
|
|
|
(setq result t
|
|
|
|
|
methods nil)))
|
|
|
|
|
result))
|
|
|
|
|
|
|
|
|
|
(defun mm-attachment-override-p (handle)
|
|
|
|
|
"Say whether HANDLE should have attachment behavior overridden."
|
|
|
|
|
(let ((types mm-attachment-override-types)
|
|
|
|
|
(type (mm-handle-media-type handle))
|
|
|
|
|
ty)
|
|
|
|
|
(catch 'found
|
|
|
|
|
(while (setq ty (pop types))
|
|
|
|
|
(when (and (string-match ty type)
|
|
|
|
|
(mm-inlinable-p handle))
|
|
|
|
|
(throw 'found t))))))
|
|
|
|
|
|
|
|
|
|
(defun mm-inline-override-p (handle)
|
|
|
|
|
"Say whether HANDLE should have inline behavior overridden."
|
|
|
|
|
(let ((types mm-inline-override-types)
|
|
|
|
|
(type (mm-handle-media-type handle))
|
|
|
|
|
ty)
|
|
|
|
|
(catch 'found
|
|
|
|
|
(while (setq ty (pop types))
|
|
|
|
|
(when (string-match ty type)
|
|
|
|
|
(throw 'found t))))))
|
|
|
|
|
|
|
|
|
|
(defun mm-automatic-external-display-p (type)
|
|
|
|
|
"Return the user-defined method for TYPE."
|
|
|
|
|
(let ((methods mm-automatic-external-display)
|
|
|
|
|
method result)
|
|
|
|
|
(while (setq method (pop methods))
|
|
|
|
|
(when (string-match method type)
|
|
|
|
|
(setq result t
|
|
|
|
|
methods nil)))
|
|
|
|
|
result))
|
|
|
|
|
|
|
|
|
|
(defun mm-destroy-part (handle)
|
|
|
|
|
"Destroy the data structures connected to HANDLE."
|
|
|
|
|
(when (listp handle)
|
|
|
|
|
(mm-remove-part handle)
|
|
|
|
|
(when (buffer-live-p (mm-handle-buffer handle))
|
|
|
|
|
(kill-buffer (mm-handle-buffer handle)))))
|
|
|
|
|
|
|
|
|
|
(defun mm-handle-displayed-p (handle)
|
|
|
|
|
"Say whether HANDLE is displayed or not."
|
|
|
|
|
(mm-handle-undisplayer handle))
|
|
|
|
|
|
|
|
|
|
;;;
|
|
|
|
|
;;; Functions for outputting parts
|
|
|
|
|
;;;
|
|
|
|
|
|
2006-03-19 19:39:53 +00:00
|
|
|
|
(defmacro mm-with-part (handle &rest forms)
|
|
|
|
|
"Run FORMS in the temp buffer containing the contents of HANDLE."
|
2008-03-12 18:30:52 +00:00
|
|
|
|
;; The handle-buffer's content is a sequence of bytes, not a sequence of
|
|
|
|
|
;; chars, so the buffer should be unibyte. It may happen that the
|
|
|
|
|
;; handle-buffer is multibyte for some reason, in which case now is a good
|
|
|
|
|
;; time to adjust it, since we know at this point that it should
|
|
|
|
|
;; be unibyte.
|
|
|
|
|
`(let* ((handle ,handle))
|
2010-09-26 04:03:19 +00:00
|
|
|
|
(when (and (mm-handle-buffer handle)
|
|
|
|
|
(buffer-name (mm-handle-buffer handle)))
|
|
|
|
|
(with-temp-buffer
|
|
|
|
|
(mm-disable-multibyte)
|
|
|
|
|
(insert-buffer-substring (mm-handle-buffer handle))
|
|
|
|
|
(mm-decode-content-transfer-encoding
|
|
|
|
|
(mm-handle-encoding handle)
|
|
|
|
|
(mm-handle-media-type handle))
|
|
|
|
|
,@forms))))
|
2006-03-19 19:39:53 +00:00
|
|
|
|
(put 'mm-with-part 'lisp-indent-function 1)
|
|
|
|
|
(put 'mm-with-part 'edebug-form-spec '(body))
|
|
|
|
|
|
2006-03-23 23:51:33 +00:00
|
|
|
|
(defun mm-get-part (handle &optional no-cache)
|
|
|
|
|
"Return the contents of HANDLE as a string.
|
|
|
|
|
If NO-CACHE is non-nil, cached contents of a message/external-body part
|
|
|
|
|
are ignored."
|
|
|
|
|
(if (and (not no-cache)
|
|
|
|
|
(equal (mm-handle-media-type handle) "message/external-body"))
|
2006-03-19 19:39:53 +00:00
|
|
|
|
(progn
|
|
|
|
|
(unless (mm-handle-cache handle)
|
|
|
|
|
(mm-extern-cache-contents handle))
|
|
|
|
|
(with-current-buffer (mm-handle-buffer (mm-handle-cache handle))
|
|
|
|
|
(buffer-string)))
|
|
|
|
|
(mm-with-part handle
|
2006-03-03 07:45:27 +00:00
|
|
|
|
(buffer-string))))
|
2000-09-19 13:40:08 +00:00
|
|
|
|
|
2006-03-23 23:51:33 +00:00
|
|
|
|
(defun mm-insert-part (handle &optional no-cache)
|
|
|
|
|
"Insert the contents of HANDLE in the current buffer.
|
|
|
|
|
If NO-CACHE is non-nil, cached contents of a message/external-body part
|
|
|
|
|
are ignored."
|
2007-10-28 09:18:39 +00:00
|
|
|
|
(let ((text (cond ((eq (mail-content-type-get (mm-handle-type handle)
|
|
|
|
|
'charset)
|
|
|
|
|
'gnus-decoded)
|
|
|
|
|
(with-current-buffer (mm-handle-buffer handle)
|
|
|
|
|
(buffer-string)))
|
|
|
|
|
((mm-multibyte-p)
|
|
|
|
|
(mm-string-to-multibyte (mm-get-part handle no-cache)))
|
|
|
|
|
(t
|
|
|
|
|
(mm-get-part handle no-cache)))))
|
|
|
|
|
(save-restriction
|
|
|
|
|
(widen)
|
|
|
|
|
(goto-char
|
|
|
|
|
(prog1
|
|
|
|
|
(point)
|
|
|
|
|
(if (and (eq (get-char-property (max (point-min) (1- (point))) 'face)
|
|
|
|
|
'mm-uu-extract)
|
|
|
|
|
(eq (get-char-property 0 'face text) 'mm-uu-extract))
|
|
|
|
|
;; Separate the extracted parts that have the same faces.
|
|
|
|
|
(insert "\n" text)
|
|
|
|
|
(insert text)))))))
|
2004-09-04 13:13:48 +00:00
|
|
|
|
|
|
|
|
|
(defun mm-file-name-delete-whitespace (file-name)
|
|
|
|
|
"Remove all whitespace characters from FILE-NAME."
|
|
|
|
|
(while (string-match "\\s-+" file-name)
|
|
|
|
|
(setq file-name (replace-match "" t t file-name)))
|
|
|
|
|
file-name)
|
|
|
|
|
|
|
|
|
|
(defun mm-file-name-trim-whitespace (file-name)
|
|
|
|
|
"Remove leading and trailing whitespace characters from FILE-NAME."
|
|
|
|
|
(when (string-match "\\`\\s-+" file-name)
|
|
|
|
|
(setq file-name (substring file-name (match-end 0))))
|
|
|
|
|
(when (string-match "\\s-+\\'" file-name)
|
|
|
|
|
(setq file-name (substring file-name 0 (match-beginning 0))))
|
|
|
|
|
file-name)
|
|
|
|
|
|
|
|
|
|
(defun mm-file-name-collapse-whitespace (file-name)
|
|
|
|
|
"Collapse multiple whitespace characters in FILE-NAME."
|
|
|
|
|
(while (string-match "\\s-\\s-+" file-name)
|
|
|
|
|
(setq file-name (replace-match " " t t file-name)))
|
|
|
|
|
file-name)
|
|
|
|
|
|
|
|
|
|
(defun mm-file-name-replace-whitespace (file-name)
|
|
|
|
|
"Replace whitespace characters in FILE-NAME with underscores.
|
|
|
|
|
Set the option `mm-file-name-replace-whitespace' to any other
|
|
|
|
|
string if you do not like underscores."
|
|
|
|
|
(let ((s (or mm-file-name-replace-whitespace "_")))
|
|
|
|
|
(while (string-match "\\s-" file-name)
|
|
|
|
|
(setq file-name (replace-match s t t file-name))))
|
|
|
|
|
file-name)
|
|
|
|
|
|
|
|
|
|
(defun mm-file-name-delete-control (filename)
|
|
|
|
|
"Delete control characters from FILENAME."
|
|
|
|
|
(gnus-replace-in-string filename "[\x00-\x1f\x7f]" ""))
|
|
|
|
|
|
|
|
|
|
(defun mm-file-name-delete-gotchas (filename)
|
|
|
|
|
"Delete shell gotchas from FILENAME."
|
|
|
|
|
(setq filename (gnus-replace-in-string filename "[<>|]" ""))
|
|
|
|
|
(gnus-replace-in-string filename "^[.-]+" ""))
|
2000-09-19 13:40:08 +00:00
|
|
|
|
|
2007-10-28 09:18:39 +00:00
|
|
|
|
(defun mm-save-part (handle &optional prompt)
|
|
|
|
|
"Write HANDLE to a file.
|
|
|
|
|
PROMPT overrides the default one used to ask user for a file name."
|
2006-03-19 19:39:53 +00:00
|
|
|
|
(let ((filename (or (mail-content-type-get
|
|
|
|
|
(mm-handle-disposition handle) 'filename)
|
|
|
|
|
(mail-content-type-get
|
|
|
|
|
(mm-handle-type handle) 'name)))
|
|
|
|
|
file)
|
2000-09-19 13:40:08 +00:00
|
|
|
|
(when filename
|
2004-09-04 13:13:48 +00:00
|
|
|
|
(setq filename (gnus-map-function mm-file-name-rewrite-functions
|
|
|
|
|
(file-name-nondirectory filename))))
|
2000-09-19 13:40:08 +00:00
|
|
|
|
(setq file
|
2010-11-04 22:18:09 +00:00
|
|
|
|
(read-file-name
|
|
|
|
|
(or prompt
|
|
|
|
|
(format "Save MIME part to (default %s): "
|
|
|
|
|
(or filename "")))
|
|
|
|
|
(or mm-default-directory default-directory)
|
|
|
|
|
(expand-file-name (or filename "")
|
|
|
|
|
(or mm-default-directory default-directory))))
|
2010-10-07 22:26:11 +00:00
|
|
|
|
(if (file-directory-p file)
|
|
|
|
|
(setq file (expand-file-name filename file))
|
|
|
|
|
(setq file (expand-file-name
|
|
|
|
|
file (or mm-default-directory default-directory))))
|
2000-09-19 13:40:08 +00:00
|
|
|
|
(setq mm-default-directory (file-name-directory file))
|
2004-09-04 13:13:48 +00:00
|
|
|
|
(and (or (not (file-exists-p file))
|
|
|
|
|
(yes-or-no-p (format "File %s already exists; overwrite? "
|
|
|
|
|
file)))
|
|
|
|
|
(progn
|
|
|
|
|
(mm-save-part-to-file handle file)
|
|
|
|
|
file))))
|
2000-09-19 13:40:08 +00:00
|
|
|
|
|
2010-03-30 04:44:38 +00:00
|
|
|
|
(defun mm-add-meta-html-tag (handle &optional charset force-charset)
|
2007-12-16 04:31:33 +00:00
|
|
|
|
"Add meta html tag to specify CHARSET of HANDLE in the current buffer.
|
|
|
|
|
CHARSET defaults to the one HANDLE specifies. Existing meta tag that
|
2010-03-30 04:44:38 +00:00
|
|
|
|
specifies charset will not be modified unless FORCE-CHARSET is non-nil.
|
|
|
|
|
Return t if meta tag is added or replaced."
|
2007-12-16 04:31:33 +00:00
|
|
|
|
(when (equal (mm-handle-media-type handle) "text/html")
|
|
|
|
|
(when (or charset
|
|
|
|
|
(setq charset (mail-content-type-get (mm-handle-type handle)
|
|
|
|
|
'charset)))
|
|
|
|
|
(setq charset (format "\
|
|
|
|
|
<meta http-equiv=\"Content-Type\" content=\"text/html; charset=%s\">" charset))
|
|
|
|
|
(let ((case-fold-search t))
|
|
|
|
|
(goto-char (point-min))
|
|
|
|
|
(if (re-search-forward "\
|
|
|
|
|
<meta\\s-+http-equiv=[\"']?content-type[\"']?\\s-+content=[\"']\
|
2010-03-29 10:16:37 +00:00
|
|
|
|
text/\\(\\sw+\\)\\(?:\;\\s-*charset=\\(.+\\)\\)?[\"'][^>]*>" nil t)
|
2010-03-30 04:44:38 +00:00
|
|
|
|
(if (and (not force-charset)
|
|
|
|
|
(match-beginning 2)
|
2007-12-16 04:31:33 +00:00
|
|
|
|
(string-match "\\`html\\'" (match-string 1)))
|
|
|
|
|
;; Don't modify existing meta tag.
|
|
|
|
|
nil
|
|
|
|
|
;; Replace it with the one specifying charset.
|
|
|
|
|
(replace-match charset)
|
|
|
|
|
t)
|
|
|
|
|
(if (re-search-forward "<head>\\s-*" nil t)
|
|
|
|
|
(insert charset "\n")
|
|
|
|
|
(re-search-forward "<html\\(?:\\s-+[^>]+\\|\\s-*\\)>\\s-*" nil t)
|
|
|
|
|
(insert "<head>\n" charset "\n</head>\n"))
|
|
|
|
|
t)))))
|
|
|
|
|
|
2000-09-19 13:40:08 +00:00
|
|
|
|
(defun mm-save-part-to-file (handle file)
|
|
|
|
|
(mm-with-unibyte-buffer
|
|
|
|
|
(mm-insert-part handle)
|
2007-12-16 04:31:33 +00:00
|
|
|
|
(mm-add-meta-html-tag handle)
|
2007-10-28 09:18:39 +00:00
|
|
|
|
(let ((current-file-modes (default-file-modes)))
|
|
|
|
|
(set-default-file-modes mm-attachment-file-modes)
|
|
|
|
|
(unwind-protect
|
2000-09-19 13:40:08 +00:00
|
|
|
|
;; Don't re-compress .gz & al. Arguably we should make
|
|
|
|
|
;; `file-name-handler-alist' nil, but that would chop
|
|
|
|
|
;; ange-ftp, which is reasonable to use here.
|
2007-10-28 09:18:39 +00:00
|
|
|
|
(mm-write-region (point-min) (point-max) file nil nil nil 'binary t)
|
2004-09-04 13:13:48 +00:00
|
|
|
|
(set-default-file-modes current-file-modes)))))
|
2000-09-19 13:40:08 +00:00
|
|
|
|
|
2010-05-07 07:28:15 +00:00
|
|
|
|
(defun mm-pipe-part (handle &optional cmd)
|
|
|
|
|
"Pipe HANDLE to a process.
|
|
|
|
|
Use CMD as the process."
|
|
|
|
|
(let ((name (mail-content-type-get (mm-handle-type handle) 'name))
|
|
|
|
|
(command (or cmd
|
|
|
|
|
(gnus-read-shell-command
|
|
|
|
|
"Shell command on MIME part: " mm-last-shell-command))))
|
2000-09-19 13:40:08 +00:00
|
|
|
|
(mm-with-unibyte-buffer
|
|
|
|
|
(mm-insert-part handle)
|
2007-12-16 04:31:33 +00:00
|
|
|
|
(mm-add-meta-html-tag handle)
|
2004-09-04 13:13:48 +00:00
|
|
|
|
(let ((coding-system-for-write 'binary))
|
|
|
|
|
(shell-command-on-region (point-min) (point-max) command nil)))))
|
2000-09-19 13:40:08 +00:00
|
|
|
|
|
2010-11-01 01:45:47 +00:00
|
|
|
|
(autoload 'gnus-completing-read "gnus-util")
|
|
|
|
|
|
2000-09-19 13:40:08 +00:00
|
|
|
|
(defun mm-interactively-view-part (handle)
|
|
|
|
|
"Display HANDLE using METHOD."
|
|
|
|
|
(let* ((type (mm-handle-media-type handle))
|
|
|
|
|
(methods
|
Merge changes made in Gnus trunk.
nndraft.el (nndraft-request-expire-articles): Use the group name instead if "nndraft".
gnus.texi (Using IMAP): Remove the @acronyms from the headings.
nnregistry.el: Added.
nnimap.el (nnimap-insert-partial-structure): Be way more permissive when interpreting the structures.
GNUS-NEWS: Minor error in GNUS-NEWS - password-cache.el.
nnimap.el (nnimap-request-accept-article): Add \r\n to the lines to make this work with Cyrus.
gnus-registry.el: Don't prompt on load, which makes it impossible to build Gnus.
gnus-gravatar.el: Add gnus-gravatar-properties.
gnus-agent.el, gnus-art.el, gnus-bookmark.el, gnus-dired.el, gnus-group.el,\
gnus-int.el, gnus-msg.el, gnus-registry.el, gnus-score.el, gnus-srvr.el,\
gnus-sum.el, gnus-topic.el, gnus-util.el, gnus.el, mm-decode.el, mm-util.el,\
mm-view.el, mml-smime.el, mml.el, nnmairix.el, nnrss.el, smime.el:\
Introduce gnus-completing-read.
gnus-util.el: Make completing-read function configurable.
gnus-util.el: Add requires and fix history for iswitchb.
webmail.el: Remove netscape/my-deja, since they no longer exist.
gnus.el (gnus-local-domain): Declare variable obsolete.
nnimap.el (nnimap-insert-partial-structure): Get the type from the correct slot, too.
pop3.el (pop3-send-streaming-command, pop3-stream-length): New variable.
nnimap.el (nnimap-open-connection): Revert the auto-network->starttls code.
nnimap.el (nnimap-request-set-mark): Erase the buffer before issuing commands.
nnimap.el (nnimap-split-rule): Mark as obsolete.
gnus-sum.el (gnus-valid-move-group-p): Make sure that `group' is a symbol.
nnimap.el (nnimap-split-incoming-mail): Allow `default' as nnimap-split-methods value.
nnimap.el (nnimap-request-article): Downcase the NILs so that they are nil.
nndoc.el (nndoc-retrieve-groups): New function.
gnus.texi: Fix Gravatar documentation.
2010-09-30 08:39:23 +00:00
|
|
|
|
(mapcar (lambda (i) (cdr (assoc 'viewer i)))
|
2000-09-19 13:40:08 +00:00
|
|
|
|
(mailcap-mime-info type 'all)))
|
2000-10-27 16:46:11 +00:00
|
|
|
|
(method (let ((minibuffer-local-completion-map
|
|
|
|
|
mm-viewer-completion-map))
|
2012-01-22 00:54:58 +00:00
|
|
|
|
(completing-read "Viewer: " methods))))
|
2000-09-19 13:40:08 +00:00
|
|
|
|
(when (string= method "")
|
|
|
|
|
(error "No method given"))
|
2001-01-04 14:47:59 +00:00
|
|
|
|
(if (string-match "^[^% \t]+$" method)
|
2000-09-19 13:40:08 +00:00
|
|
|
|
(setq method (concat method " %s")))
|
2001-01-21 05:33:42 +00:00
|
|
|
|
(mm-display-external handle method)))
|
2000-09-19 13:40:08 +00:00
|
|
|
|
|
|
|
|
|
(defun mm-preferred-alternative (handles &optional preferred)
|
|
|
|
|
"Say which of HANDLES are preferred."
|
|
|
|
|
(let ((prec (if preferred (list preferred)
|
|
|
|
|
(mm-preferred-alternative-precedence handles)))
|
|
|
|
|
p h result type handle)
|
|
|
|
|
(while (setq p (pop prec))
|
|
|
|
|
(setq h handles)
|
|
|
|
|
(while h
|
|
|
|
|
(setq handle (car h))
|
|
|
|
|
(setq type (mm-handle-media-type handle))
|
|
|
|
|
(when (and (equal p type)
|
|
|
|
|
(mm-automatic-display-p handle)
|
|
|
|
|
(or (stringp (car handle))
|
|
|
|
|
(not (mm-handle-disposition handle))
|
|
|
|
|
(equal (car (mm-handle-disposition handle))
|
|
|
|
|
"inline")))
|
|
|
|
|
(setq result handle
|
|
|
|
|
h nil
|
|
|
|
|
prec nil))
|
|
|
|
|
(pop h)))
|
|
|
|
|
result))
|
|
|
|
|
|
|
|
|
|
(defun mm-preferred-alternative-precedence (handles)
|
|
|
|
|
"Return the precedence based on HANDLES and `mm-discouraged-alternatives'."
|
2011-01-11 23:32:50 +00:00
|
|
|
|
(setq handles (reverse handles))
|
|
|
|
|
(dolist (disc (reverse mm-discouraged-alternatives))
|
|
|
|
|
(dolist (handle (copy-sequence handles))
|
|
|
|
|
(when (string-match disc (mm-handle-media-type handle))
|
|
|
|
|
(setq handles (nconc (delete handle handles) (list handle))))))
|
|
|
|
|
;; Remove empty parts.
|
|
|
|
|
(dolist (handle (copy-sequence handles))
|
2011-01-22 12:34:50 +00:00
|
|
|
|
(when (and (bufferp (mm-handle-buffer handle))
|
|
|
|
|
(not (with-current-buffer (mm-handle-buffer handle)
|
|
|
|
|
(goto-char (point-min))
|
|
|
|
|
(re-search-forward "[^ \t\n]" nil t))))
|
2011-01-11 23:32:50 +00:00
|
|
|
|
(setq handles (nconc (delete handle handles) (list handle)))))
|
|
|
|
|
(mapcar #'mm-handle-media-type handles))
|
2000-09-19 13:40:08 +00:00
|
|
|
|
|
|
|
|
|
(defun mm-get-content-id (id)
|
|
|
|
|
"Return the handle(s) referred to by ID."
|
|
|
|
|
(cdr (assoc id mm-content-id-alist)))
|
|
|
|
|
|
2004-09-04 13:13:48 +00:00
|
|
|
|
(defconst mm-image-type-regexps
|
|
|
|
|
'(("/\\*.*XPM.\\*/" . xpm)
|
|
|
|
|
("P[1-6]" . pbm)
|
|
|
|
|
("GIF8" . gif)
|
|
|
|
|
("\377\330" . jpeg)
|
|
|
|
|
("\211PNG\r\n" . png)
|
|
|
|
|
("#define" . xbm)
|
|
|
|
|
("\\(MM\0\\*\\)\\|\\(II\\*\0\\)" . tiff)
|
|
|
|
|
("%!PS" . postscript))
|
|
|
|
|
"Alist of (REGEXP . IMAGE-TYPE) pairs used to auto-detect image types.
|
|
|
|
|
When the first bytes of an image file match REGEXP, it is assumed to
|
|
|
|
|
be of image type IMAGE-TYPE.")
|
|
|
|
|
|
|
|
|
|
;; Steal from image.el. image-type-from-data suffers multi-line matching bug.
|
|
|
|
|
(defun mm-image-type-from-buffer ()
|
|
|
|
|
"Determine the image type from data in the current buffer.
|
|
|
|
|
Value is a symbol specifying the image type or nil if type cannot
|
|
|
|
|
be determined."
|
|
|
|
|
(let ((types mm-image-type-regexps)
|
|
|
|
|
type)
|
|
|
|
|
(goto-char (point-min))
|
|
|
|
|
(while (and types (null type))
|
|
|
|
|
(let ((regexp (car (car types)))
|
|
|
|
|
(image-type (cdr (car types))))
|
|
|
|
|
(when (looking-at regexp)
|
|
|
|
|
(setq type image-type))
|
|
|
|
|
(setq types (cdr types))))
|
|
|
|
|
type))
|
|
|
|
|
|
2000-09-19 13:40:08 +00:00
|
|
|
|
(defun mm-get-image (handle)
|
|
|
|
|
"Return an image instance based on HANDLE."
|
|
|
|
|
(let ((type (mm-handle-media-subtype handle))
|
|
|
|
|
spec)
|
|
|
|
|
;; Allow some common translations.
|
|
|
|
|
(setq type
|
|
|
|
|
(cond
|
|
|
|
|
((equal type "x-pixmap")
|
|
|
|
|
"xpm")
|
|
|
|
|
((equal type "x-xbitmap")
|
|
|
|
|
"xbm")
|
2001-01-04 14:47:59 +00:00
|
|
|
|
((equal type "x-portable-bitmap")
|
|
|
|
|
"pbm")
|
2000-09-19 13:40:08 +00:00
|
|
|
|
(t type)))
|
|
|
|
|
(or (mm-handle-cache handle)
|
|
|
|
|
(mm-with-unibyte-buffer
|
|
|
|
|
(mm-insert-part handle)
|
|
|
|
|
(prog1
|
|
|
|
|
(setq spec
|
|
|
|
|
(ignore-errors
|
2004-09-04 13:13:48 +00:00
|
|
|
|
;; Avoid testing `make-glyph' since W3 may define
|
|
|
|
|
;; a bogus version of it.
|
2000-09-19 13:40:08 +00:00
|
|
|
|
(if (fboundp 'create-image)
|
2004-09-04 13:13:48 +00:00
|
|
|
|
(create-image (buffer-string)
|
|
|
|
|
(or (mm-image-type-from-buffer)
|
|
|
|
|
(intern type))
|
|
|
|
|
'data-p)
|
|
|
|
|
(mm-create-image-xemacs type))))
|
2000-09-19 13:40:08 +00:00
|
|
|
|
(mm-handle-set-cache handle spec))))))
|
|
|
|
|
|
2004-09-04 13:13:48 +00:00
|
|
|
|
(defun mm-create-image-xemacs (type)
|
* smime.el (from):
* rfc2047.el (message-posting-charset):
* qp.el (mm-use-ultra-safe-encoding):
* pop3.el (parse-time-months):
* nnrss.el (mm-text-html-renderer, mm-text-html-washer-alist):
* nnml.el (files):
* nnheader.el (gnus-newsgroup-name, nnheader-file-coding-system)
(jka-compr-compression-info-list, ange-ftp-path-format)
(efs-path-regexp):
* nndiary.el (files):
* mml2015.el (mc-default-scheme, mc-schemes, pgg-default-user-id)
(pgg-errors-buffer, pgg-output-buffer, epg-user-id-alist)
(epg-digest-algorithm-alist, inhibit-redisplay)
(password-cache-expiry):
* mml1991.el (pgg-default-user-id, pgg-errors-buffer)
(pgg-output-buffer, password-cache-expiry):
* mml.el (mml-dnd-protocol-alist, ange-ftp-name-format)
(efs-path-regexp):
* mml-smime.el (epg-user-id-alist, epg-digest-algorithm-alist)
(inhibit-redisplay):
* mm-uu.el (file-name, start-point, end-point, entry)
(gnus-newsgroup-name, gnus-newsgroup-charset):
* mm-util.el (mm-mime-mule-charset-alist, latin-unity-coding-systems)
(latin-unity-ucs-list):
* mm-bodies.el (mm-uu-yenc-decode-function, mm-uu-decode-function)
(mm-uu-binhex-decode-function):
* message.el (gnus-message-group-art, gnus-list-identifiers, )
(rmail-enable-mime-composing, gnus-local-organization)
(gnus-post-method, gnus-select-method, gnus-active-hashtb)
(gnus-read-active-file, facemenu-add-face-function)
(facemenu-remove-face-function, gnus-article-decoded-p)
(tool-bar-mode):
* mail-source.el (display-time-mail-function):
* gnus-util.el (nnmail-pathname-coding-system)
(nnmail-active-file-coding-system, gnus-emphasize-whitespace-regexp)
(gnus-original-article-buffer, gnus-user-agent)
(rmail-default-rmail-file, mm-text-coding-system, tool-bar-mode)
(xemacs-codename, sxemacs-codename, emacs-program-version):
* gnus-sum.el (tool-bar-mode, gnus-tmp-header, number):
* gnus-start.el (gnus-agent-covered-methods)
(gnus-agent-file-loading-local, gnus-agent-file-loading-cache)
(gnus-current-headers, gnus-thread-indent-array, gnus-newsgroup-name)
(gnus-newsgroup-headers, gnus-group-list-mode)
(gnus-group-mark-positions, gnus-newsgroup-data)
(gnus-newsgroup-unreads, nnoo-state-alist)
(gnus-current-select-method, mail-sources)
(nnmail-scan-directory-mail-source-once, nnmail-split-history)
(nnmail-spool-file, gnus-cache-active-hashtb):
* gnus-mh.el (mh-lib-progs):
* gnus-ems.el (gnus-tmp-unread, gnus-tmp-replied)
(gnus-tmp-score-char, gnus-tmp-indentation, gnus-tmp-opening-bracket)
(gnus-tmp-lines, gnus-tmp-name, gnus-tmp-closing-bracket)
(gnus-tmp-subject-or-nil, gnus-check-before-posting, gnus-mouse-face)
(gnus-group-buffer):
* gnus-cite.el (font-lock-defaults-computed, font-lock-keywords)
(font-lock-set-defaults):
* gnus-art.el (tool-bar-map, w3m-minor-mode-map)
(gnus-face-properties-alist, charset, gnus-summary-article-menu)
(gnus-summary-post-menu, total-parts, type, condition, length):
* gnus-agent.el (gnus-agent-read-agentview):
* flow-fill.el (show-trailing-whitespace):
* gnus-group.el (tool-bar-mode, nnrss-group-alist): Remove unnecessary
eval-and-compile wrappers for byte compiler pacifiers.
* mm-view.el (mm-inline-image-xemacs): Only do something for XEmacs.
(mm-display-inline-fontify): Check for featurep 'xemacs not
extent-list.
* mm-decode.el (mm-display-external): Check for featurep 'xemacs not
itimer-list.
(mm-create-image-xemacs): Only do something for XEmacs.
(mm-image-fit-p): Check for featurep 'xemacs not glyph-width.
* mm-util.el (mm-find-buffer-file-coding-system): Add check for XEmacs.
* gnus-registry.el (gnus-adaptive-word-syntax-table):
* gnus-fun.el (gnus-face-properties-alist): Pacify byte compiler.
* textmodes/reftex-dcr.el (reftex-start-itimer-once): Add check
for XEmacs.
* calc/calc-menu.el (calc-mode-map): Pacify byte compiler.
* doc-view.el (doc-view-resolution): Add missing :group.
2007-11-16 16:50:35 +00:00
|
|
|
|
(when (featurep 'xemacs)
|
|
|
|
|
(cond
|
|
|
|
|
((equal type "xbm")
|
|
|
|
|
;; xbm images require special handling, since
|
|
|
|
|
;; the only way to create glyphs from these
|
|
|
|
|
;; (without a ton of work) is to write them
|
|
|
|
|
;; out to a file, and then create a file
|
|
|
|
|
;; specifier.
|
|
|
|
|
(let ((file (mm-make-temp-file
|
|
|
|
|
(expand-file-name "emm" mm-tmp-directory)
|
|
|
|
|
nil ".xbm")))
|
|
|
|
|
(unwind-protect
|
|
|
|
|
(progn
|
|
|
|
|
(write-region (point-min) (point-max) file)
|
|
|
|
|
(make-glyph (list (cons 'x file))))
|
|
|
|
|
(ignore-errors
|
|
|
|
|
(delete-file file)))))
|
|
|
|
|
(t
|
|
|
|
|
(make-glyph
|
|
|
|
|
(vector
|
|
|
|
|
(or (mm-image-type-from-buffer)
|
|
|
|
|
(intern type))
|
|
|
|
|
:data (buffer-string)))))))
|
2004-09-04 13:13:48 +00:00
|
|
|
|
|
2008-06-11 03:10:59 +00:00
|
|
|
|
(declare-function image-size "image.c" (spec &optional pixels frame))
|
|
|
|
|
|
2000-09-19 13:40:08 +00:00
|
|
|
|
(defun mm-image-fit-p (handle)
|
|
|
|
|
"Say whether the image in HANDLE will fit the current window."
|
|
|
|
|
(let ((image (mm-get-image handle)))
|
2007-06-14 10:02:55 +00:00
|
|
|
|
(or (not image)
|
* smime.el (from):
* rfc2047.el (message-posting-charset):
* qp.el (mm-use-ultra-safe-encoding):
* pop3.el (parse-time-months):
* nnrss.el (mm-text-html-renderer, mm-text-html-washer-alist):
* nnml.el (files):
* nnheader.el (gnus-newsgroup-name, nnheader-file-coding-system)
(jka-compr-compression-info-list, ange-ftp-path-format)
(efs-path-regexp):
* nndiary.el (files):
* mml2015.el (mc-default-scheme, mc-schemes, pgg-default-user-id)
(pgg-errors-buffer, pgg-output-buffer, epg-user-id-alist)
(epg-digest-algorithm-alist, inhibit-redisplay)
(password-cache-expiry):
* mml1991.el (pgg-default-user-id, pgg-errors-buffer)
(pgg-output-buffer, password-cache-expiry):
* mml.el (mml-dnd-protocol-alist, ange-ftp-name-format)
(efs-path-regexp):
* mml-smime.el (epg-user-id-alist, epg-digest-algorithm-alist)
(inhibit-redisplay):
* mm-uu.el (file-name, start-point, end-point, entry)
(gnus-newsgroup-name, gnus-newsgroup-charset):
* mm-util.el (mm-mime-mule-charset-alist, latin-unity-coding-systems)
(latin-unity-ucs-list):
* mm-bodies.el (mm-uu-yenc-decode-function, mm-uu-decode-function)
(mm-uu-binhex-decode-function):
* message.el (gnus-message-group-art, gnus-list-identifiers, )
(rmail-enable-mime-composing, gnus-local-organization)
(gnus-post-method, gnus-select-method, gnus-active-hashtb)
(gnus-read-active-file, facemenu-add-face-function)
(facemenu-remove-face-function, gnus-article-decoded-p)
(tool-bar-mode):
* mail-source.el (display-time-mail-function):
* gnus-util.el (nnmail-pathname-coding-system)
(nnmail-active-file-coding-system, gnus-emphasize-whitespace-regexp)
(gnus-original-article-buffer, gnus-user-agent)
(rmail-default-rmail-file, mm-text-coding-system, tool-bar-mode)
(xemacs-codename, sxemacs-codename, emacs-program-version):
* gnus-sum.el (tool-bar-mode, gnus-tmp-header, number):
* gnus-start.el (gnus-agent-covered-methods)
(gnus-agent-file-loading-local, gnus-agent-file-loading-cache)
(gnus-current-headers, gnus-thread-indent-array, gnus-newsgroup-name)
(gnus-newsgroup-headers, gnus-group-list-mode)
(gnus-group-mark-positions, gnus-newsgroup-data)
(gnus-newsgroup-unreads, nnoo-state-alist)
(gnus-current-select-method, mail-sources)
(nnmail-scan-directory-mail-source-once, nnmail-split-history)
(nnmail-spool-file, gnus-cache-active-hashtb):
* gnus-mh.el (mh-lib-progs):
* gnus-ems.el (gnus-tmp-unread, gnus-tmp-replied)
(gnus-tmp-score-char, gnus-tmp-indentation, gnus-tmp-opening-bracket)
(gnus-tmp-lines, gnus-tmp-name, gnus-tmp-closing-bracket)
(gnus-tmp-subject-or-nil, gnus-check-before-posting, gnus-mouse-face)
(gnus-group-buffer):
* gnus-cite.el (font-lock-defaults-computed, font-lock-keywords)
(font-lock-set-defaults):
* gnus-art.el (tool-bar-map, w3m-minor-mode-map)
(gnus-face-properties-alist, charset, gnus-summary-article-menu)
(gnus-summary-post-menu, total-parts, type, condition, length):
* gnus-agent.el (gnus-agent-read-agentview):
* flow-fill.el (show-trailing-whitespace):
* gnus-group.el (tool-bar-mode, nnrss-group-alist): Remove unnecessary
eval-and-compile wrappers for byte compiler pacifiers.
* mm-view.el (mm-inline-image-xemacs): Only do something for XEmacs.
(mm-display-inline-fontify): Check for featurep 'xemacs not
extent-list.
* mm-decode.el (mm-display-external): Check for featurep 'xemacs not
itimer-list.
(mm-create-image-xemacs): Only do something for XEmacs.
(mm-image-fit-p): Check for featurep 'xemacs not glyph-width.
* mm-util.el (mm-find-buffer-file-coding-system): Add check for XEmacs.
* gnus-registry.el (gnus-adaptive-word-syntax-table):
* gnus-fun.el (gnus-face-properties-alist): Pacify byte compiler.
* textmodes/reftex-dcr.el (reftex-start-itimer-once): Add check
for XEmacs.
* calc/calc-menu.el (calc-mode-map): Pacify byte compiler.
* doc-view.el (doc-view-resolution): Add missing :group.
2007-11-16 16:50:35 +00:00
|
|
|
|
(if (featurep 'xemacs)
|
2012-02-28 08:17:21 +00:00
|
|
|
|
;; XEmacs's glyphs can actually tell us about their width, so
|
2011-11-15 17:37:37 +00:00
|
|
|
|
;; let's be nice and smart about them.
|
2007-06-14 10:02:55 +00:00
|
|
|
|
(or mm-inline-large-images
|
|
|
|
|
(and (<= (glyph-width image) (window-pixel-width))
|
|
|
|
|
(<= (glyph-height image) (window-pixel-height))))
|
|
|
|
|
(let* ((size (image-size image))
|
|
|
|
|
(w (car size))
|
|
|
|
|
(h (cdr size)))
|
|
|
|
|
(or mm-inline-large-images
|
|
|
|
|
(and (<= h (1- (window-height))) ; Don't include mode line.
|
|
|
|
|
(<= w (window-width)))))))))
|
2000-09-19 13:40:08 +00:00
|
|
|
|
|
|
|
|
|
(defun mm-valid-image-format-p (format)
|
|
|
|
|
"Say whether FORMAT can be displayed natively by Emacs."
|
|
|
|
|
(cond
|
|
|
|
|
;; Handle XEmacs
|
|
|
|
|
((fboundp 'valid-image-instantiator-format-p)
|
|
|
|
|
(valid-image-instantiator-format-p format))
|
2010-09-28 12:35:18 +00:00
|
|
|
|
;; Handle Emacs
|
2000-09-19 13:40:08 +00:00
|
|
|
|
((fboundp 'image-type-available-p)
|
|
|
|
|
(and (display-graphic-p)
|
|
|
|
|
(image-type-available-p format)))
|
|
|
|
|
;; Nobody else can do images yet.
|
|
|
|
|
(t
|
|
|
|
|
nil)))
|
|
|
|
|
|
|
|
|
|
(defun mm-valid-and-fit-image-p (format handle)
|
|
|
|
|
"Say whether FORMAT can be displayed natively and HANDLE fits the window."
|
2000-10-27 16:46:11 +00:00
|
|
|
|
(and (mm-valid-image-format-p format)
|
2000-09-19 13:40:08 +00:00
|
|
|
|
(mm-image-fit-p handle)))
|
|
|
|
|
|
2004-09-04 13:13:48 +00:00
|
|
|
|
(defun mm-find-part-by-type (handles type &optional notp recursive)
|
|
|
|
|
"Search in HANDLES for part with TYPE.
|
|
|
|
|
If NOTP, returns first non-matching part.
|
|
|
|
|
If RECURSIVE, search recursively."
|
|
|
|
|
(let (handle)
|
|
|
|
|
(while handles
|
|
|
|
|
(if (and recursive (stringp (caar handles)))
|
|
|
|
|
(if (setq handle (mm-find-part-by-type (cdar handles) type
|
|
|
|
|
notp recursive))
|
|
|
|
|
(setq handles nil))
|
|
|
|
|
(if (if notp
|
|
|
|
|
(not (equal (mm-handle-media-type (car handles)) type))
|
|
|
|
|
(equal (mm-handle-media-type (car handles)) type))
|
|
|
|
|
(setq handle (car handles)
|
|
|
|
|
handles nil)))
|
|
|
|
|
(setq handles (cdr handles)))
|
|
|
|
|
handle))
|
|
|
|
|
|
|
|
|
|
(defun mm-find-raw-part-by-type (ctl type &optional notp)
|
|
|
|
|
(goto-char (point-min))
|
|
|
|
|
(let* ((boundary (concat "--" (mm-handle-multipart-ctl-parameter ctl
|
|
|
|
|
'boundary)))
|
|
|
|
|
(close-delimiter (concat "^" (regexp-quote boundary) "--[ \t]*$"))
|
|
|
|
|
start
|
|
|
|
|
(end (save-excursion
|
|
|
|
|
(goto-char (point-max))
|
|
|
|
|
(if (re-search-backward close-delimiter nil t)
|
|
|
|
|
(match-beginning 0)
|
|
|
|
|
(point-max))))
|
|
|
|
|
result)
|
|
|
|
|
(setq boundary (concat "^" (regexp-quote boundary) "[ \t]*$"))
|
|
|
|
|
(while (and (not result)
|
|
|
|
|
(re-search-forward boundary end t))
|
|
|
|
|
(goto-char (match-beginning 0))
|
|
|
|
|
(when start
|
|
|
|
|
(save-excursion
|
|
|
|
|
(save-restriction
|
|
|
|
|
(narrow-to-region start (1- (point)))
|
2006-02-08 04:35:58 +00:00
|
|
|
|
(when (let* ((ct (mail-fetch-field "content-type"))
|
|
|
|
|
(ctl (and ct (mail-header-parse-content-type ct))))
|
2004-09-04 13:13:48 +00:00
|
|
|
|
(if notp
|
|
|
|
|
(not (equal (car ctl) type))
|
|
|
|
|
(equal (car ctl) type)))
|
|
|
|
|
(setq result (buffer-string))))))
|
|
|
|
|
(forward-line 1)
|
|
|
|
|
(setq start (point)))
|
|
|
|
|
(when (and (not result) start)
|
|
|
|
|
(save-excursion
|
|
|
|
|
(save-restriction
|
|
|
|
|
(narrow-to-region start end)
|
2006-02-08 04:35:58 +00:00
|
|
|
|
(when (let* ((ct (mail-fetch-field "content-type"))
|
|
|
|
|
(ctl (and ct (mail-header-parse-content-type ct))))
|
2004-09-04 13:13:48 +00:00
|
|
|
|
(if notp
|
|
|
|
|
(not (equal (car ctl) type))
|
|
|
|
|
(equal (car ctl) type)))
|
|
|
|
|
(setq result (buffer-string))))))
|
|
|
|
|
result))
|
|
|
|
|
|
|
|
|
|
(defvar mm-security-handle nil)
|
|
|
|
|
|
|
|
|
|
(defsubst mm-set-handle-multipart-parameter (handle parameter value)
|
|
|
|
|
;; HANDLE could be a CTL.
|
|
|
|
|
(when handle
|
|
|
|
|
(put-text-property 0 (length (car handle)) parameter value
|
|
|
|
|
(car handle))))
|
|
|
|
|
|
2007-12-11 05:41:13 +00:00
|
|
|
|
(autoload 'mm-view-pkcs7 "mm-view")
|
|
|
|
|
|
2010-11-11 23:51:05 +00:00
|
|
|
|
(defun mm-possibly-verify-or-decrypt (parts ctl &optional from)
|
2004-09-04 13:13:48 +00:00
|
|
|
|
(let ((type (car ctl))
|
|
|
|
|
(subtype (cadr (split-string (car ctl) "/")))
|
|
|
|
|
(mm-security-handle ctl) ;; (car CTL) is the type.
|
|
|
|
|
protocol func functest)
|
|
|
|
|
(cond
|
|
|
|
|
((or (equal type "application/x-pkcs7-mime")
|
|
|
|
|
(equal type "application/pkcs7-mime"))
|
|
|
|
|
(with-temp-buffer
|
|
|
|
|
(when (and (cond
|
|
|
|
|
((eq mm-decrypt-option 'never) nil)
|
|
|
|
|
((eq mm-decrypt-option 'always) t)
|
|
|
|
|
((eq mm-decrypt-option 'known) t)
|
|
|
|
|
(t (y-or-n-p
|
|
|
|
|
(format "Decrypt (S/MIME) part? "))))
|
2010-11-11 23:51:05 +00:00
|
|
|
|
(mm-view-pkcs7 parts from))
|
2004-09-04 13:13:48 +00:00
|
|
|
|
(setq parts (mm-dissect-buffer t)))))
|
|
|
|
|
((equal subtype "signed")
|
|
|
|
|
(unless (and (setq protocol
|
|
|
|
|
(mm-handle-multipart-ctl-parameter ctl 'protocol))
|
|
|
|
|
(not (equal protocol "multipart/mixed")))
|
|
|
|
|
;; The message is broken or draft-ietf-openpgp-multsig-01.
|
|
|
|
|
(let ((protocols mm-verify-function-alist))
|
|
|
|
|
(while protocols
|
|
|
|
|
(if (and (or (not (setq functest (nth 3 (car protocols))))
|
|
|
|
|
(funcall functest parts ctl))
|
|
|
|
|
(mm-find-part-by-type parts (caar protocols) nil t))
|
|
|
|
|
(setq protocol (caar protocols)
|
|
|
|
|
protocols nil)
|
|
|
|
|
(setq protocols (cdr protocols))))))
|
|
|
|
|
(setq func (nth 1 (assoc protocol mm-verify-function-alist)))
|
|
|
|
|
(when (cond
|
|
|
|
|
((eq mm-verify-option 'never) nil)
|
|
|
|
|
((eq mm-verify-option 'always) t)
|
|
|
|
|
((eq mm-verify-option 'known)
|
|
|
|
|
(and func
|
|
|
|
|
(or (not (setq functest
|
|
|
|
|
(nth 3 (assoc protocol
|
|
|
|
|
mm-verify-function-alist))))
|
|
|
|
|
(funcall functest parts ctl))))
|
|
|
|
|
(t
|
|
|
|
|
(y-or-n-p
|
|
|
|
|
(format "Verify signed (%s) part? "
|
|
|
|
|
(or (nth 2 (assoc protocol mm-verify-function-alist))
|
|
|
|
|
(format "protocol=%s" protocol))))))
|
|
|
|
|
(save-excursion
|
|
|
|
|
(if func
|
2007-10-28 09:18:39 +00:00
|
|
|
|
(setq parts (funcall func parts ctl))
|
2004-09-04 13:13:48 +00:00
|
|
|
|
(mm-set-handle-multipart-parameter
|
|
|
|
|
mm-security-handle 'gnus-details
|
|
|
|
|
(format "Unknown sign protocol (%s)" protocol))))))
|
|
|
|
|
((equal subtype "encrypted")
|
|
|
|
|
(unless (setq protocol
|
|
|
|
|
(mm-handle-multipart-ctl-parameter ctl 'protocol))
|
|
|
|
|
;; The message is broken.
|
|
|
|
|
(let ((parts parts))
|
|
|
|
|
(while parts
|
|
|
|
|
(if (assoc (mm-handle-media-type (car parts))
|
|
|
|
|
mm-decrypt-function-alist)
|
|
|
|
|
(setq protocol (mm-handle-media-type (car parts))
|
|
|
|
|
parts nil)
|
|
|
|
|
(setq parts (cdr parts))))))
|
|
|
|
|
(setq func (nth 1 (assoc protocol mm-decrypt-function-alist)))
|
|
|
|
|
(when (cond
|
|
|
|
|
((eq mm-decrypt-option 'never) nil)
|
|
|
|
|
((eq mm-decrypt-option 'always) t)
|
|
|
|
|
((eq mm-decrypt-option 'known)
|
|
|
|
|
(and func
|
|
|
|
|
(or (not (setq functest
|
|
|
|
|
(nth 3 (assoc protocol
|
|
|
|
|
mm-decrypt-function-alist))))
|
|
|
|
|
(funcall functest parts ctl))))
|
|
|
|
|
(t
|
|
|
|
|
(y-or-n-p
|
|
|
|
|
(format "Decrypt (%s) part? "
|
|
|
|
|
(or (nth 2 (assoc protocol mm-decrypt-function-alist))
|
|
|
|
|
(format "protocol=%s" protocol))))))
|
|
|
|
|
(save-excursion
|
|
|
|
|
(if func
|
|
|
|
|
(setq parts (funcall func parts ctl))
|
|
|
|
|
(mm-set-handle-multipart-parameter
|
|
|
|
|
mm-security-handle 'gnus-details
|
|
|
|
|
(format "Unknown encrypt protocol (%s)" protocol))))))
|
|
|
|
|
(t nil))
|
|
|
|
|
parts))
|
|
|
|
|
|
|
|
|
|
(defun mm-multiple-handles (handles)
|
|
|
|
|
(and (listp handles)
|
|
|
|
|
(> (length handles) 1)
|
|
|
|
|
(or (listp (car handles))
|
|
|
|
|
(stringp (car handles)))))
|
|
|
|
|
|
|
|
|
|
(defun mm-complicated-handles (handles)
|
|
|
|
|
(and (listp (car handles))
|
|
|
|
|
(> (length handles) 1)))
|
|
|
|
|
|
|
|
|
|
(defun mm-merge-handles (handles1 handles2)
|
|
|
|
|
(append
|
|
|
|
|
(if (listp (car handles1))
|
|
|
|
|
handles1
|
|
|
|
|
(list handles1))
|
|
|
|
|
(if (listp (car handles2))
|
|
|
|
|
handles2
|
|
|
|
|
(list handles2))))
|
|
|
|
|
|
|
|
|
|
(defun mm-readable-p (handle)
|
|
|
|
|
"Say whether the content of HANDLE is readable."
|
|
|
|
|
(and (< (with-current-buffer (mm-handle-buffer handle)
|
|
|
|
|
(buffer-size)) 10000)
|
|
|
|
|
(mm-with-unibyte-buffer
|
|
|
|
|
(mm-insert-part handle)
|
|
|
|
|
(and (eq (mm-body-7-or-8) '7bit)
|
|
|
|
|
(not (mm-long-lines-p 76))))))
|
|
|
|
|
|
2010-10-05 02:08:37 +00:00
|
|
|
|
(declare-function libxml-parse-html-region "xml.c"
|
|
|
|
|
(start end &optional base-url))
|
|
|
|
|
(declare-function shr-insert-document "shr" (dom))
|
2010-10-14 01:17:30 +00:00
|
|
|
|
(defvar shr-blocked-images)
|
2010-11-17 07:22:19 +00:00
|
|
|
|
(defvar gnus-inhibit-images)
|
2010-11-01 01:45:47 +00:00
|
|
|
|
(autoload 'gnus-blocked-images "gnus-art")
|
2010-10-05 02:08:37 +00:00
|
|
|
|
|
2010-10-03 00:33:27 +00:00
|
|
|
|
(defun mm-shr (handle)
|
2010-10-05 22:43:06 +00:00
|
|
|
|
;; Require since we bind its variables.
|
|
|
|
|
(require 'shr)
|
2010-10-05 02:08:37 +00:00
|
|
|
|
(let ((article-buffer (current-buffer))
|
2010-10-05 22:43:06 +00:00
|
|
|
|
(shr-content-function (lambda (id)
|
|
|
|
|
(let ((handle (mm-get-content-id id)))
|
|
|
|
|
(when handle
|
|
|
|
|
(mm-with-part handle
|
|
|
|
|
(buffer-string))))))
|
2010-12-07 05:06:56 +00:00
|
|
|
|
shr-inhibit-images shr-blocked-images charset char)
|
2010-11-19 04:55:16 +00:00
|
|
|
|
(if (and (boundp 'gnus-summary-buffer)
|
2012-01-04 22:14:09 +00:00
|
|
|
|
(bufferp gnus-summary-buffer)
|
2010-11-19 04:55:16 +00:00
|
|
|
|
(buffer-name gnus-summary-buffer))
|
|
|
|
|
(with-current-buffer gnus-summary-buffer
|
|
|
|
|
(setq shr-inhibit-images gnus-inhibit-images
|
|
|
|
|
shr-blocked-images (gnus-blocked-images)))
|
|
|
|
|
(setq shr-inhibit-images gnus-inhibit-images
|
|
|
|
|
shr-blocked-images (gnus-blocked-images)))
|
2010-10-03 00:33:27 +00:00
|
|
|
|
(unless handle
|
|
|
|
|
(setq handle (mm-dissect-buffer t)))
|
2010-10-05 02:08:37 +00:00
|
|
|
|
(setq charset (mail-content-type-get (mm-handle-type handle) 'charset))
|
2010-10-04 00:17:16 +00:00
|
|
|
|
(save-restriction
|
|
|
|
|
(narrow-to-region (point) (point))
|
|
|
|
|
(shr-insert-document
|
|
|
|
|
(mm-with-part handle
|
2010-12-07 05:06:56 +00:00
|
|
|
|
(insert (prog1
|
|
|
|
|
(if (and charset
|
|
|
|
|
(setq charset
|
|
|
|
|
(mm-charset-to-coding-system charset))
|
|
|
|
|
(not (eq charset 'ascii)))
|
|
|
|
|
(mm-decode-coding-string (buffer-string) charset)
|
|
|
|
|
(mm-string-as-multibyte (buffer-string)))
|
|
|
|
|
(erase-buffer)
|
|
|
|
|
(mm-enable-multibyte)))
|
|
|
|
|
(goto-char (point-min))
|
|
|
|
|
(setq case-fold-search t)
|
|
|
|
|
(while (re-search-forward
|
|
|
|
|
"&#\\(?:x\\([89][0-9a-f]\\)\\|\\(1[2-5][0-9]\\)\\);" nil t)
|
|
|
|
|
(when (setq char
|
|
|
|
|
(cdr (assq (if (match-beginning 1)
|
|
|
|
|
(string-to-number (match-string 1) 16)
|
|
|
|
|
(string-to-number (match-string 2)))
|
|
|
|
|
mm-extra-numeric-entities)))
|
|
|
|
|
(replace-match (char-to-string char))))
|
2012-02-20 14:25:28 +00:00
|
|
|
|
;; Remove "soft hyphens".
|
|
|
|
|
(goto-char (point-min))
|
|
|
|
|
(while (search-forward "<EFBFBD>" nil t)
|
|
|
|
|
(replace-match "" t t))
|
2010-10-27 03:59:59 +00:00
|
|
|
|
(libxml-parse-html-region (point-min) (point-max))))
|
|
|
|
|
(mm-handle-set-undisplayer
|
|
|
|
|
handle
|
|
|
|
|
`(lambda ()
|
|
|
|
|
(let ((inhibit-read-only t))
|
|
|
|
|
(delete-region ,(point-min-marker)
|
|
|
|
|
,(point-max-marker))))))))
|
2010-10-03 00:33:27 +00:00
|
|
|
|
|
2011-03-25 23:27:18 +00:00
|
|
|
|
(defun mm-handle-filename (handle)
|
|
|
|
|
"Return filename of HANDLE if any."
|
|
|
|
|
(or (mail-content-type-get (mm-handle-type handle)
|
|
|
|
|
'name)
|
|
|
|
|
(mail-content-type-get (mm-handle-disposition handle)
|
|
|
|
|
'filename)))
|
|
|
|
|
|
2000-09-19 13:40:08 +00:00
|
|
|
|
(provide 'mm-decode)
|
|
|
|
|
|
|
|
|
|
;;; mm-decode.el ends here
|