xemacs-beta: lisp/tm/tm-edit.el comparison

comparison lisp/tm/tm-edit.el @ 70:131b0175ea99 r20-0b30

Import from CVS: tag r20-0b30

author	cvs
date	Mon, 13 Aug 2007 09:02:59 +0200
parents	56c54cf7c5b6
children	54cc21c15cbb

comparison

equal deleted inserted replaced

-:804d1389bcd6
+:131b0175ea99
 ;;; tm-edit.el --- Simple MIME Composer for GNU Emacs
-;; Copyright (C) 1993,1994,1995,1996,1997 Free Software Foundation, Inc.
+;; Copyright (C) 1993 .. 1996 Free Software Foundation, Inc.
 ;; Author: UMEDA Masanobu <umerin@mse.kyutech.ac.jp>
 ;;         MORIOKA Tomohiko <morioka@jaist.ac.jp>
 ;; Maintainer: MORIOKA Tomohiko <morioka@jaist.ac.jp>
 ;; Created: 1994/08/21 renamed from mime.el
-;; Version: $Revision: 1.8 $
+;; Version: $Revision: 1.1.1.1 $
 ;; Keywords: mail, news, MIME, multimedia, multilingual
 ;; This file is part of tm (Tools for MIME).
 ;; This program is free software; you can redistribute it and/or
 ;; Boston, MA 02111-1307, USA.
 ;;; Commentary:
 ;; This is an Emacs minor mode for editing Internet multimedia
-;; messages formatted in MIME (RFC 2045, 2046, 2047, 2048 and 2049).
+;; messages formatted in MIME (RFC 1521 and RFC 1522). All messages in
-;; All messages in this mode are composed in the tagged MIME format,
+;; this mode are composed in the tagged MIME format, that are
-;; that are described in the following examples.  The messages
+;; described in the following examples. The messages composed in the
-;; composed in the tagged MIME format are automatically translated
+;; tagged MIME format are automatically translated into a MIME
-;; into a MIME compliant message when exiting the mode.
+;; compliant message when exiting the mode.
 ;; Mule (a multilingual extension to Emacs 18 and 19) has a capability
 ;; of handling multilingual text in limited ISO-2022 manner that is
 ;; based on early experiences in Japanese Internet community and
-;; resulted in RFC 1468 (ISO-2022-JP charset for MIME).  In order to
+;; resulted in RFC 1468 (ISO-2022-JP charset for MIME). In order to
 ;; enable multilingual capability in single text message in MIME,
 ;; charset of multilingual text written in Mule is declared as either
-;; `ISO-2022-JP-2' [RFC 1554].  Mule is required for reading the such
+;; `ISO-2022-JP-2' [RFC 1554] or `ISO-2022-INT-1'. Mule is required
-;; messages.
+;; for reading the such messages.
 ;; This MIME composer can work with Mail mode, mh-e letter Mode, and
 ;; News mode.  First of all, you need the following autoload
 ;; definition to load mime/editor-mode automatically:
 ;;
 ;; This is a conventional plain text.  It should be translated into
 ;; text/plain.
 ;;
 ;;--[[text/plain]]
 ;; This is also a plain text.  But, it is explicitly specified as is.
-;;--[[text/plain; charset=ISO-8859-1]]
-;; This is also a plain text.  But charset is specified as iso-8859-1.
 ;;
-;; ¡Hola!  Buenos días.  ¿Cómo está usted?
+;;--[[text/plain; charset=ISO-2022-JP]]
-;;--[[text/enriched]]
+;; $B$3$l$O(B charset $B$r(B ISO-2022-JP $B$K;XDj$7$?F|K\8l$N(B plain $B/home/mrb/e/w/editor/lisp/tm/SCCS/s.tm-edit.el-%9%H$G$9(B.
+;;
+;;--[[text/richtext]]
 ;; <center>This is a richtext.</center>
 ;;
 ;;--[[image/gif][base64]]^M...image encoded in base64 comes here...
 ;;
 ;;--[[audio/basic][base64]]^M...audio encoded in base64 comes here...
 ;;; Code:
 (require 'sendmail)
 (require 'mail-utils)
 (require 'mel)
+(require 'tl-822)
 (require 'tl-list)
 (require 'tm-view)
 (require 'tm-ew-e)
 (require 'signature)
 ;;; @ version
 ;;;
 (defconst mime-editor/RCS-ID
-"$Id: tm-edit.el,v 1.8 1997/08/21 06:24:11 steve Exp $")
+"$Id: tm-edit.el,v 1.1.1.1 1996/12/18 22:43:37 steve Exp $")
 (defconst mime-editor/version (get-version-string mime-editor/RCS-ID))
 (defconst mime-editor/version-name
 (concat "tm-edit " mime-editor/version))
 ("postscript")
 ("x-kiss" ("x-cnf")))
 ("image"
 ("gif")
 ("jpeg")
-("png")
 ("tiff")
 ("x-pic")
 ("x-mag")
 ("x-xwd")
 ("x-xbm")
 "base64"
 "inline"		(("filename" . file))
 )
 ("\\.gif$"
 "image"	"gif"		nil
-"base64"
-"inline"		(("filename" . file))
-)
-("\\.png$"
-"image"	"png"		nil
 "base64"
 "inline"		(("filename" . file))
 )
 ("\\.tiff$"
 "image"	"tiff"		nil
 "7bit"
 "attachment"	(("filename" . file))
 )
 ("\\.tar\\.gz$"
 "application" "octet-stream" (("type" . "tar+gzip"))
-"base64"
+nil
 "attachment"	(("filename" . file))
 )
 ("\\.tgz$"
 "application" "octet-stream" (("type" . "tar+gzip"))
-"base64"
+nil
 "attachment"	(("filename" . file))
 )
 ("\\.tar\\.Z$"
 "application" "octet-stream" (("type" . "tar+compress"))
-"base64"
+nil
 "attachment"	(("filename" . file))
 )
 ("\\.taz$"
 "application" "octet-stream" (("type" . "tar+compress"))
-"base64"
+nil
 "attachment"	(("filename" . file))
 )
 ("\\.gz$"
 "application" "octet-stream" (("type" . "gzip"))
-"base64"
+nil
 "attachment"	(("filename" . file))
 )
 ("\\.Z$"
 "application" "octet-stream" (("type" . "compress"))
-"base64"
+nil
 "attachment"	(("filename" . file))
 )
 ("\\.lzh$"
 "application" "octet-stream" (("type" . "lha"))
-"base64"
+nil
 "attachment"	(("filename" . file))
 )
 ("\\.zip$"
 "application" "zip" nil
-"base64"
+nil
 "attachment"	(("filename" . file))
 )
 ("\\.diff$"
 "application" "octet-stream" (("type" . "patch"))
 nil
 ;;; @@ about charset, encoding and transfer-level
 ;;;
 (defvar mime-editor/transfer-level 7
-"*A number of network transfer level.  It should be bigger than 7.")
+"*A number of network transfer level. It should be bigger than 7.")
 (make-variable-buffer-local 'mime-editor/transfer-level)
 (defvar mime-editor/transfer-level-string
 (mime/encoding-name mime-editor/transfer-level 'not-omit)
 "*A string formatted version of mime/defaul-transfer-level")
 (defvar mime-editor/signing-type 'pgp-elkins
 "*PGP signing type (pgp-elkins, pgp-kazu or nil). [tm-edit.el]")
 (defvar mime-editor/encrypting-type 'pgp-elkins
 "*PGP encrypting type (pgp-elkins, pgp-kazu or nil). [tm-edit.el]")
+(defvar mime-editor/pgp-sign-function 'tm:mc-pgp-sign-region)
+(defvar mime-editor/pgp-encrypt-function 'tm:mc-pgp-encrypt-region)
+(defvar mime-editor/traditional-pgp-sign-function 'mc-pgp-sign-region)
+(defvar mime-editor/pgp-insert-public-key-function 'mc-insert-public-key)
+(autoload mime-editor/pgp-sign-function "tm-edit-mc")
+(autoload mime-editor/pgp-encrypt-function "tm-edit-mc")
+(autoload mime-editor/traditional-pgp-sign-function "mc-pgp")
+(autoload mime-editor/pgp-insert-public-key-function "mc-toplev")
 ;;; @@ about tag
 ;;;
 "MIME minor mode for editing the tagged MIME message.
 In this mode, basically, the message is composed in the tagged MIME
 format. The message tag looks like:
-	--[[text/plain; charset=ISO-2022-JP][7bit]]
+	`--[[text/plain; charset=ISO-2022-JP][7bit]]'.
 The tag specifies the MIME content type, subtype, optional parameters
 and transfer encoding of the message following the tag. Messages
 without any tag are treated as `text/plain' by default. Charset and
 transfer encoding are automatically defined unless explicitly
 coding-system is different as MIME charset, please set variable
 `mime-charset-coding-system-alist'. This variable must be alist of
 which key is MIME charset and value is coding-system.
 Following commands are available in addition to major mode commands:
-\[make single part\]
 \\[mime-editor/insert-text]	insert a text message.
 \\[mime-editor/insert-file]	insert a (binary) file.
 \\[mime-editor/insert-external]	insert a reference to external body.
 \\[mime-editor/insert-voice]	insert a voice message.
 \\[mime-editor/insert-message]	insert a mail or news message.
 \\[mime-editor/insert-mail]	insert a mail message.
 \\[mime-editor/insert-signature]	insert a signature file at end.
-\\[mime-editor/insert-key]	insert PGP public key.
 \\[mime-editor/insert-tag]	insert a new MIME tag.
-\[make enclosure (maybe multipart)\]
 \\[mime-editor/enclose-alternative-region]	enclose as multipart/alternative.
 \\[mime-editor/enclose-parallel-region]	enclose as multipart/parallel.
 \\[mime-editor/enclose-mixed-region]	enclose as multipart/mixed.
 \\[mime-editor/enclose-digest-region]	enclose as multipart/digest.
 \\[mime-editor/enclose-signed-region]	enclose as PGP signed.
 \\[mime-editor/enclose-encrypted-region]	enclose as PGP encrypted.
-\\[mime-editor/enclose-quote-region]	enclose as verbose mode (to avoid to expand tags)
+\\[mime-editor/insert-key]	insert PGP public key.
-\[other commands\]
-\\[mime-editor/set-transfer-level-7bit]	set transfer-level as 7.
-\\[mime-editor/set-transfer-level-8bit]	set transfer-level as 8.
-\\[mime-editor/set-split]	set message splitting mode.
-\\[mime-editor/set-sign]	set PGP-sign mode.
-\\[mime-editor/set-encrypt]	set PGP-encryption mode.
 \\[mime-editor/preview-message]	preview editing MIME message.
 \\[mime-editor/exit]	exit and translate into a MIME compliant message.
+\\[mime-editor/maybe-translate]	exit and translate if in MIME mode, then split.
 \\[mime-editor/help]	show this help.
-\\[mime-editor/maybe-translate]	exit and translate if in MIME mode, then split.
 Additional commands are available in some major modes:
 C-c C-c		exit, translate and run the original command.
 C-c C-s		exit, translate and run the original command.
 	This is a conventional plain text.  It should be translated
 	into text/plain.
 	--[[text/plain]]
 	This is also a plain text.  But, it is explicitly specified as
 	is.
-	--[[text/plain; charset=ISO-8859-1]]
+	--[[text/plain; charset=ISO-2022-JP]]
-	This is also a plain text.  But charset is specified as
+	$B$3$l$O(B charset $B$r(B ISO-2022-JP $B$K;XDj$7$?F|K\8l$N(B plain $B/home/mrb/e/w/editor/lisp/tm/SCCS/s.tm-edit.el-%9(B
-	iso-8859-1.
+	$B%H$G$9(B.
+	--[[text/richtext]]
-	¡Hola!  Buenos días.  ¿Cómo está usted?
+	<center>This is a richtext.</center>
-	--[[text/enriched]]
+	--[[image/gif][base64]]^M...image encoded in base64 here...
-	This is a <bold>enriched text</bold>.
+	--[[audio/basic][base64]]^M...audio encoded in base64 here...
-	--[[image/gif][base64]]...image encoded in base64 here...
-	--[[audio/basic][base64]]...audio encoded in base64 here...
 User customizable variables (not documented all of them):
 mime-prefix
 Specifies a key prefix for MIME minor mode commands.
 Preceding white spaces in a message body are ignored if non-nil.
 mime-ignore-trailing-spaces
 Trailing white spaces in a message body are ignored if non-nil.
+mime-auto-fill-header
+Fill header fields that contain encoded-words if non-nil.
 mime-auto-hide-body
 Hide a non-textual body message encoded in base64 after insertion
 if non-nil.
-mime-editor/transfer-level
-A number of network transfer level.  It should be bigger than 7.
-If you are in 8bit-through environment, please set 8.
 mime-editor/voice-recorder
 Specifies a function to record a voice message and encode it.
 The function `mime-editor/voice-recorder-for-sun' is for Sun
 SparcStations.
 	  (run-hooks 'mime-editor/translate-hook)
 	  (mime-editor/translate-buffer)))
 ;; Restore previous state.
 (setq mime/editor-mode-flag nil)
 (cond (running-xemacs
-	   (if (featurep 'menubar)
+	   (delete-menu-item (list mime-editor/menu-title)))
-	       (delete-menu-item (list mime-editor/menu-title))))
 	  (t
 	   (use-local-map mime/editor-mode-old-local-map)))
 (end-of-invisible)
 (set-buffer-modified-p (buffer-modified-p))
 (princ (documentation 'mime/editor-mode))
 (print-help-return-message)))
 (defun mime-editor/insert-text ()
 "Insert a text message.
-Charset is automatically obtained from the `charsets-mime-charset-alist'."
+Charset is automatically obtained from the `mime/lc-charset-alist'."
 (interactive)
 (let ((ret (mime-editor/insert-tag "text" nil nil)))
 (if ret
 (progn
 	(if (looking-at mime-editor/single-part-tag-regexp)
 	    (enriched-mode t)
 	  (if (boundp 'enriched-mode)
 	      (enriched-mode nil)
 	    ))))))
-(defun mime-editor/insert-file (file &optional verbose)
+(defun mime-editor/insert-file (file)
 "Insert a message from a file."
-(interactive "fInsert file as MIME message: \nP")
+(interactive "fInsert file as MIME message: ")
 (let*  ((guess (mime-find-file-type file))
-	  (type (nth 0 guess))
+	  (pritype (nth 0 guess))
 	  (subtype (nth 1 guess))
 	  (parameters (nth 2 guess))
-	  (encoding (nth 3 guess))
+	  (default (nth 3 guess))	;Guess encoding from its file name.
 	  (disposition-type (nth 4 guess))
 	  (disposition-params (nth 5 guess))
-	  )
+	  (encoding
-(if verbose
+	   (if (not (interactive-p))
-	(setq type    (mime-prompt-for-type type)
+	       default
-	      subtype (mime-prompt-for-subtype type subtype)
+	     (completing-read
-	      ))
+	      (concat "What transfer encoding"
-(if (or (interactive-p) verbose)
+		      (if default
-	(setq encoding (mime-prompt-for-encoding encoding))
+			  (concat " (default "
-)
+				  (if (string-equal default "")
+				      "\"\""
+				    default)
+				  ")"
+				  ))
+		      ": ")
+	      mime-file-encoding-method-alist nil t nil))))
+(if (string-equal encoding "")
+	(setq encoding default))
 (if (or (consp parameters) (stringp disposition-type))
 	(let ((rest parameters) cell attribute value)
 	  (setq parameters "")
 	  (while rest
 	    (setq cell (car rest))
 			(concat parameters "; " attribute "=" value))
 		  (setq rest (cdr rest))
 		  )
 		))
 	  ))
-(mime-editor/insert-tag type subtype parameters)
+(mime-editor/insert-tag pritype subtype parameters)
 (mime-editor/insert-binary-file file encoding)
 ))
 (defun mime-editor/insert-external ()
 "Insert a reference to external body."
 	  (setq guess (cdr (car guesses))))
 (setq guesses (cdr guesses)))
 guess
 ))
-(defun mime-prompt-for-type (&optional default)
+(defun mime-prompt-for-type ()
 "Ask for Content-type."
 (let ((type ""))
 ;; Repeat until primary content type is specified.
 (while (string-equal type "")
 (setq type
 	    (completing-read "What content type: "
 			     mime-content-types
 			     nil
 			     'require-match ;Type must be specified.
-			     default
+			     nil
 			     ))
 (if (string-equal type "")
 	  (progn
 	    (message "Content type is required.")
 	    (beep)
 	    (sit-for 1)
 	    ))
 )
-type))
+type
+))
-(defun mime-prompt-for-subtype (type &optional default)
-"Ask for subtype of media-type TYPE."
+(defun mime-prompt-for-subtype (pritype)
-(let ((subtypes (cdr (assoc type mime-content-types))))
+"Ask for Content-type subtype of Content-Type PRITYPE."
-(or (and default
+(let* ((default (car (car (cdr (assoc pritype mime-content-types)))))
-	     (assoc default subtypes))
+	 (answer
-	(setq default (car (car subtypes)))
-	))
-(let* ((answer
 	  (completing-read
 	   (if default
 	       (concat
 		"What content subtype: (default " default ") ")
 	     "What content subtype: ")
-	   (cdr (assoc type mime-content-types))
+	   (cdr (assoc pritype mime-content-types))
 	   nil
 	   'require-match		;Subtype must be specified.
 	   nil
 	   )))
 (if (string-equal answer "") default answer)))
 		      (if (string-match mime-tspecials-regexp answer)
 			  (concat "\"" answer "\"") answer)))
 	  (mime-prompt-for-parameters-1 (cdr (assoc answer (cdr parameter)))))
 ))
-(defun mime-prompt-for-encoding (default)
+(defun mime-flag-region (from to flag)
-"Ask for Content-Transfer-Encoding. [tm-edit.el]"
+"Hides or shows lines from FROM to TO, according to FLAG.
-(let (encoding)
+If FLAG is `\\n' (newline character) then text is shown,
-(while (string=
+while if FLAG is `\\^M' (control-M) the text is hidden."
-	    (setq encoding
+(let ((buffer-read-only nil)		;Okay even if write protected.
-		  (completing-read
+	(modp (buffer-modified-p)))
-		   "What transfer encoding: "
+(unwind-protect
-		   mime-file-encoding-method-alist nil t default)
+(subst-char-in-region from to
-		  )
+			      (if (= flag ?\n) ?\^M ?\n)
-	    ""))
+			      flag t)
-encoding))
+(set-buffer-modified-p modp))))
 ;;; @ Translate the tagged MIME messages into a MIME compliant message.
 ;;;
 	(insert (format "Content-Type: %s\n" ctype))
 	(if encoding
 	    (insert (format "Content-Transfer-Encoding: %s\n" encoding))
 	  )
 	(insert "\n")
-	(or (funcall (pgp-function 'mime-sign)
+	(or (funcall mime-editor/pgp-sign-function
 		     (point-min)(point-max) nil nil pgp-boundary)
 	    (throw 'mime-editor/error 'pgp-error)
 	    )
 	))))
 	  (insert (format "Content-Type: %s\n" ctype))
 	  (if encoding
 	      (insert (format "Content-Transfer-Encoding: %s\n" encoding))
 	    )
 	  (insert "\n")
-	  (or (funcall (pgp-function 'encrypt)
+	  (or (funcall mime-editor/pgp-encrypt-function
 		       recipients (point-min) (point-max) from)
 	      (throw 'mime-editor/error 'pgp-error)
 	      )
 	  (goto-char beg)
 	  (insert (format "--[[multipart/encrypted;
 	(if encoding
 	    (insert (format "Content-Transfer-Encoding: %s\n" encoding))
 	  )
 	(insert "\n")
 	(or (as-binary-process
-	     (funcall (pgp-function 'traditional-sign)
+	     (funcall mime-editor/traditional-pgp-sign-function
 		      beg (point-max)))
 	    (throw 'mime-editor/error 'pgp-error)
 	    )
 	(goto-char beg)
 	(insert
 	  (if encoding
 	      (insert (format "Content-Transfer-Encoding: %s\n" encoding))
 	    )
 	  (insert "\n")
 	  (or (as-binary-process
-	       (funcall (pgp-function 'encrypt)
+	       (funcall mime-editor/pgp-encrypt-function
 			recipients beg (point-max) nil 'maybe)
 	       )
 	      (throw 'mime-editor/error 'pgp-error)
 	      )
 	  (goto-char beg)
 (let* ((beg (match-beginning 0))
 	     (end (match-end 0))
 	     (tag (buffer-substring beg end))
 	     )
 	(delete-region beg end)
-	(let ((contype (mime-editor/get-contype tag))
+	(setq contype (mime-editor/get-contype tag))
-	      (encoding (mime-editor/get-encoding tag))
+	(setq encoding (mime-editor/get-encoding tag))
-	      )
+	(insert (concat prefix "--" boundary "\n"))
-	  (insert (concat prefix "--" boundary "\n"))
+	(save-restriction
-	  (save-restriction
+	  (narrow-to-region (point)(point))
-	    (narrow-to-region (point)(point))
+	  (insert "Content-Type: " contype "\n")
-	    (insert "Content-Type: " contype "\n")
+	  (if encoding
-	    (if encoding
+	      (insert "Content-Transfer-Encoding: " encoding "\n"))
-		(insert "Content-Transfer-Encoding: " encoding "\n"))
+	  (mime/encode-message-header)
-	    (mime/encode-message-header)
+	  )
-	    ))
 	t)))
 (defun mime-editor/translate-region (beg end &optional boundary multipart)
 (if (null boundary)
 (setq boundary
 (defun mime-editor/insert-key (&optional arg)
 "Insert a pgp public key."
 (interactive "P")
 (mime-editor/insert-tag "application" "pgp-keys")
 (mime-editor/define-encoding "7bit")
-(funcall (pgp-function 'insert-key))
+(funcall mime-editor/pgp-insert-public-key-function)
 )
 ;;; @ flag setting
 ;;;
 		  (setq stype (substring ctype (match-end 0)))
 		  )
 	      (setq type ctype)
 	      )
 	    (cond
-	     ((string= ctype "application/pgp-signature")
+	     ((string-equal type "multipart")
-	      (delete-region (point-min)(point-max))
-	      )
-	     ((string= type "multipart")
 	      (let* ((boundary (assoc-value "boundary" params))
 		     (boundary-pat
 		      (concat "\n--" (regexp-quote boundary) "[ \t]*\n"))
 		     )
 		(re-search-forward boundary-pat nil t)
 				     )))
 		))
 	     (t
 	      (let* (charset
 		     (pstr
-		      (let ((bytes (+ 14 (length ctype))))
+		      (mapconcat (function
-			(mapconcat (function
+				  (lambda (attr)
-				    (lambda (attr)
+				    (if (string-equal (car attr)
-				      (if (string-equal (car attr) "charset")
+						      "charset")
-					  (progn
+					(progn
-					    (setq charset (cdr attr))
+					  (setq charset (cdr attr))
-					    "")
+					  "")
-					(let* ((str
+				      (concat ";" (car attr)
-						(concat (car attr)
+					      "=" (cdr attr))
-							"=" (cdr attr))
+				      )
-						)
+				    ))
-					       (bs (length str))
+				 params ""))
-					       )
-					  (setq bytes (+ bytes bs 2))
-					  (if (< bytes 76)
-					      (concat "; " str)
-					    (setq bytes (+ bs 1))
-					    (concat ";\n " str)
-					    )
-					  ))))
-				   params "")))
 		     encoding
 		     encoded)
 		(save-excursion
 		  (if (re-search-forward
 		       "Content-Transfer-Encoding:" nil t)

Mercurial > hg > xemacs-beta

comparison lisp/tm/tm-edit.el @ 70:131b0175ea99 r20-0b30