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

comparison lisp/tm/tm-edit.el @ 76:c0c698873ce1 r20-0b33

Import from CVS: tag r20-0b33

author	cvs
date	Mon, 13 Aug 2007 09:05:10 +0200
parents	54cc21c15cbb
children	c7528f8e288d

comparison

equal deleted inserted replaced

-:a4e0195b387b
+:c0c698873ce1
 ;; 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.1.1.2 $
+;; Version: $Revision: 1.2 $
 ;; 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
 ;;; @ version
 ;;;
 (defconst mime-editor/RCS-ID
-"$Id: tm-edit.el,v 1.1.1.2 1996/12/21 20:50:44 steve Exp $")
+"$Id: tm-edit.el,v 1.2 1996/12/28 21:03:13 steve Exp $")
 (defconst mime-editor/version (get-version-string mime-editor/RCS-ID))
 (defconst mime-editor/version-name
 (concat "tm-edit " mime-editor/version))
 "7bit"
 "attachment"	(("filename" . file))
 )
 ("\\.tar\\.gz$"
 "application" "octet-stream" (("type" . "tar+gzip"))
-nil
+"base64"
 "attachment"	(("filename" . file))
 )
 ("\\.tgz$"
 "application" "octet-stream" (("type" . "tar+gzip"))
-nil
+"base64"
 "attachment"	(("filename" . file))
 )
 ("\\.tar\\.Z$"
 "application" "octet-stream" (("type" . "tar+compress"))
-nil
+"base64"
 "attachment"	(("filename" . file))
 )
 ("\\.taz$"
 "application" "octet-stream" (("type" . "tar+compress"))
-nil
+"base64"
 "attachment"	(("filename" . file))
 )
 ("\\.gz$"
 "application" "octet-stream" (("type" . "gzip"))
-nil
+"base64"
 "attachment"	(("filename" . file))
 )
 ("\\.Z$"
 "application" "octet-stream" (("type" . "compress"))
-nil
+"base64"
 "attachment"	(("filename" . file))
 )
 ("\\.lzh$"
 "application" "octet-stream" (("type" . "lha"))
-nil
+"base64"
 "attachment"	(("filename" . file))
 )
 ("\\.zip$"
 "application" "zip" nil
-nil
+"base64"
 "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")
 ;;; @ functions
 ;;;
+;; The following text was removed from the docstring of the subsequent
+;; functions due to problems with the resulting autoload file. -sb
+;;	--[[text/plain; charset=ISO-2022-JP]]
+;;	$B$3$l$O(B charset $B$r(B ISO-2022-JP $B$K;XDj$7$?F|K\8l$N(B plain $B%F%-%9(B
+;;	$B%H$G$9(B.
 ;;;###autoload
 (defun mime/editor-mode ()
 "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/insert-key]	insert PGP public key.
+\\[mime-editor/enclose-quote-region]	enclose as verbose mode (to avoid to expand tags)
+\[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/help]	show this help.
 \\[mime-editor/maybe-translate]	exit and translate if in MIME mode, then split.
-\\[mime-editor/help]	show this help.
 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-2022-JP]]
-	$B$3$l$O(B charset $B$r(B ISO-2022-JP $B$K;XDj$7$?F|K\8l$N(B plain $B%F%-%9(B
-	$B%H$G$9(B.
 	--[[text/richtext]]
 	<center>This is a richtext.</center>
 	--[[image/gif][base64]]^M...image encoded in base64 here...
 	--[[audio/basic][base64]]^M...audio encoded in base64 here...
 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.
 	    (enriched-mode t)
 	  (if (boundp 'enriched-mode)
 	      (enriched-mode nil)
 	    ))))))
-(defun mime-editor/insert-file (file)
+(defun mime-editor/insert-file (file &optional verbose)
 "Insert a message from a file."
-(interactive "fInsert file as MIME message: ")
+(interactive "fInsert file as MIME message: \nP")
 (let*  ((guess (mime-find-file-type file))
-	  (pritype (nth 0 guess))
+	  (type (nth 0 guess))
 	  (subtype (nth 1 guess))
 	  (parameters (nth 2 guess))
-	  (default (nth 3 guess))	;Guess encoding from its file name.
+	  (encoding (nth 3 guess))
 	  (disposition-type (nth 4 guess))
 	  (disposition-params (nth 5 guess))
-	  (encoding
+	  )
-	   (if (not (interactive-p))
+(if verbose
-	       default
+	(setq type    (mime-prompt-for-type type)
-	     (completing-read
+	      subtype (mime-prompt-for-subtype type subtype)
-	      (concat "What transfer encoding"
+	      ))
-		      (if default
+(if (or (interactive-p) verbose)
-			  (concat " (default "
+	(setq encoding (mime-prompt-for-encoding encoding))
-				  (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 pritype subtype parameters)
+(mime-editor/insert-tag type 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 ()
+(defun mime-prompt-for-type (&optional default)
 "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.
-			     nil
+			     default
 			     ))
 (if (string-equal type "")
 	  (progn
 	    (message "Content type is required.")
 	    (beep)
 	    (sit-for 1)
 	    ))
 )
-type
+type))
-))
+(defun mime-prompt-for-subtype (type &optional default)
-(defun mime-prompt-for-subtype (pritype)
+"Ask for subtype of media-type TYPE."
-"Ask for Content-type subtype of Content-Type PRITYPE."
+(let ((subtypes (cdr (assoc type mime-content-types))))
-(let* ((default (car (car (cdr (assoc pritype mime-content-types)))))
+(or (and default
-	 (answer
+	     (assoc default subtypes))
+	(setq default (car (car subtypes)))
+	))
+(let* ((answer
 	  (completing-read
 	   (if default
 	       (concat
 		"What content subtype: (default " default ") ")
 	     "What content subtype: ")
-	   (cdr (assoc pritype mime-content-types))
+	   (cdr (assoc type 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-flag-region (from to flag)
+(defun mime-prompt-for-encoding (default)
-"Hides or shows lines from FROM to TO, according to FLAG.
+"Ask for Content-Transfer-Encoding. [tm-edit.el]"
-If FLAG is `\\n' (newline character) then text is shown,
+(let (encoding)
-while if FLAG is `\\^M' (control-M) the text is hidden."
+(while (string=
-(let ((buffer-read-only nil)		;Okay even if write protected.
+	    (setq encoding
-	(modp (buffer-modified-p)))
+		  (completing-read
-(unwind-protect
+		   "What transfer encoding: "
-(subst-char-in-region from to
+		   mime-file-encoding-method-alist nil t default)
-			      (if (= flag ?\n) ?\^M ?\n)
+		  )
-			      flag t)
+	    ""))
-(set-buffer-modified-p modp))))
+encoding))
 ;;; @ Translate the tagged MIME messages into a MIME compliant message.
 ;;;

Mercurial > hg > xemacs-beta

comparison lisp/tm/tm-edit.el @ 76:c0c698873ce1 r20-0b33