;;; mm-uu.el --- Return uu stuff as mm handles
;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;; 2005, 2006 Free Software Foundation, Inc.
+;; 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
;; Author: Shenghuo Zhu <zsh@cs.rochester.edu>
;; Keywords: postscript uudecode binhex shar forward gnatsweb pgp
;; This file is part of GNU Emacs.
-;; GNU Emacs is free software; you can redistribute it and/or modify
+;; GNU Emacs is free software: you can redistribute it and/or modify
;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-;;
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
;; GNU Emacs is distributed in the hope that it will be useful,
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
;; GNU General Public License for more details.
;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
+;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
;;; Commentary:
(defvar mm-uu-yenc-decode-function 'yenc-decode-region)
-(defvar mm-uu-pgp-beginning-signature
- "^-----BEGIN PGP SIGNATURE-----")
-
(defvar mm-uu-beginning-regexp nil)
(defvar mm-dissect-disposition "inline"
(defcustom mm-uu-tex-groups-regexp "\\.tex\\>"
"*Regexp matching TeX groups."
- :version "23.0"
+ :version "23.1"
:type 'regexp
:group 'gnus-article-mime)
;; dependency on `message.el'.
"^-+[8<>]*-\\{9,\\}[a-z ]+-\\{9,\\}[a-z ]+-\\{9,\\}[8<>]*-+$"
"^-+[8<>]*-\\{9,\\}[a-z ]+-\\{9,\\}[a-z ]+-\\{9,\\}[8<>]*-+$"
- (lambda () (mm-uu-verbatim-marks-extract 0 -1 1 -1))
+ (lambda () (mm-uu-verbatim-marks-extract 0 0 1 -1))
nil)
;; Omitting [a-z8<] leads to false positives (bogus signature separators
;; and mailing list banners).
;; http://www.slrn.org/manual/slrn-manual-6.html#ss6.81
"^#v\\+"
"^#v\\-$"
- (lambda () (mm-uu-verbatim-marks-extract 0 0 1 -1))
+ (lambda () (mm-uu-verbatim-marks-extract 0 0))
nil)
(LaTeX
"^\\([\\\\%][^\n]+\n\\)*\\\\documentclass.*[[{%]"
Each element consist of the following entries: label,
start-regexp, end-regexp, extract-function, test-function.
-After modifying this list you must run \\[mm-uu-configure].")
+After modifying this list you must run \\[mm-uu-configure].
+
+You can disable elements from this list by customizing
+`mm-uu-configure-list'.")
(defcustom mm-uu-configure-list '((shar . disabled))
"A list of mm-uu configuration.
`mm-uu-extract' isn't distinguishable to the face `default'."
:type '(choice (const :tag "Hide" t)
(const :tag "Don't hide" nil))
- :version "23.0" ;; No Gnus
+ :version "23.1" ;; No Gnus
:group 'gnus-article-mime)
-(defface mm-uu-extract '(;; Colors from `gnus-cite-3' plus background:
+(defface mm-uu-extract '(;; Inspired by `gnus-cite-3'
+ (((type tty)
+ (class color)
+ (background dark))
+ (:background "dark blue"))
(((class color)
(background dark))
(:foreground "light yellow"
:background "dark green"))
+ (((type tty)
+ (class color)
+ (background light))
+ (:foreground "dark blue"))
(((class color)
(background light))
(:foreground "dark green"
()))
"Face for extracted buffers."
;; See `mm-uu-verbatim-marks-extract'.
- :version "23.0" ;; No Gnus
+ :version "23.1" ;; No Gnus
:group 'gnus-article-mime)
(defun mm-uu-copy-to-buffer (&optional from to properties)
see `set-text-properties'. If PROPERTIES equals t, this means to
apply the face `mm-uu-extract'."
(let ((obuf (current-buffer))
- (coding-system
+ (multi (and (boundp 'enable-multibyte-characters)
+ enable-multibyte-characters))
+ (coding-system
;; Might not exist in non-MULE XEmacs
(when (boundp 'buffer-file-coding-system)
buffer-file-coding-system)))
(with-current-buffer (generate-new-buffer " *mm-uu*")
+ (if multi (mm-enable-multibyte) (mm-disable-multibyte))
(setq buffer-file-coding-system coding-system)
(insert-buffer-substring obuf from to)
(cond ((eq properties t)
(mm-uu-configure)
-(eval-when-compile
- (defvar file-name)
- (defvar start-point)
- (defvar end-point)
- (defvar entry))
+(defvar file-name)
+(defvar start-point)
+(defvar end-point)
+(defvar entry)
(defun mm-uu-uu-filename ()
(if (looking-at ".+")
(list mm-dissect-disposition
(cons 'filename file-name))))
-(eval-when-compile
- (defvar gnus-newsgroup-name))
+(defvar gnus-newsgroup-name)
(defun mm-uu-emacs-sources-test ()
(setq file-name (match-string 1))
(list mm-dissect-disposition
(cons 'filename file-name)))))
+(defvar gnus-original-article-buffer) ; gnus.el
+
(defun mm-uu-yenc-extract ()
- (mm-make-handle (mm-uu-copy-to-buffer start-point end-point)
+ ;; This might not be exactly correct, but we sure can't get the
+ ;; binary data from the article buffer, since that's already in a
+ ;; non-binary charset. So get it from the original article buffer.
+ (mm-make-handle (with-current-buffer gnus-original-article-buffer
+ (mm-uu-copy-to-buffer start-point end-point))
(list (or (and file-name
(string-match "\\.[^\\.]+$" file-name)
(mailcap-extension-to-mime
(y-or-n-p "Verify pgp signed part? ")
(message ""))))))
-(eval-when-compile
- (defvar gnus-newsgroup-charset))
+(defvar gnus-newsgroup-charset)
(defun mm-uu-pgp-signed-extract-1 (handles ctl)
(let ((buf (mm-uu-copy-to-buffer (point-min) (point-max))))
(if (mm-uu-pgp-signed-test)
(progn
(mml2015-clean-buffer)
- (let ((coding-system-for-write (or gnus-newsgroup-charset
- 'iso-8859-1)))
+ (let ((coding-system-for-write (or buffer-file-coding-system
+ gnus-newsgroup-charset
+ 'iso-8859-1))
+ (coding-system-for-read (or buffer-file-coding-system
+ gnus-newsgroup-charset
+ 'iso-8859-1)))
(funcall (mml2015-clear-verify-function))))
(when (and mml2015-use (null (mml2015-clear-verify-function)))
(mm-set-handle-multipart-parameter
mm-security-handle 'gnus-details
- (format "Clear verification not supported by `%s'.\n" mml2015-use))))
- (goto-char (point-min))
- (if (re-search-forward "\n[\t ]*\n" nil t)
- (delete-region (point-min) (point)))
- (if (re-search-forward mm-uu-pgp-beginning-signature nil t)
- (delete-region (match-beginning 0) (point-max)))
- (goto-char (point-min))
- (while (re-search-forward "^- " nil t)
- (replace-match "" t t)
- (forward-line 1)))
- (list (mm-make-handle buf mm-uu-text-plain-type))))
+ (format "Clear verification not supported by `%s'.\n" mml2015-use)))
+ (mml2015-extract-cleartext-signature))
+ (list (mm-make-handle buf mm-uu-text-plain-type)))))
(defun mm-uu-pgp-signed-extract ()
(let ((mm-security-handle (list (format "multipart/signed"))))
(provide 'mm-uu)
-;; arch-tag: 7db076bf-53db-4320-aa19-ca76a1d2ab2c
;;; mm-uu.el ends here