This commit was generated by cvs2svn to compensate for changes in r509,

[elisp/tm.git] / mime-setup.el.in

diff --git a/mime-setup.el.in b/mime-setup.el.in
index 132faf1..c12bc6f 100644 (file)
--- a/mime-setup.el.in
+++ b/mime-setup.el.in
@@ -1,32 +1,29 @@
-;;;
 ;;; mime-setup.el --- setup file for tm viewer and composer.
-;;;
-;;; Copyright (C) 1995 Free Software Foundation, Inc.
-;;; Copyright (C) 1994 .. 1996 MORIOKA Tomohiko
-;;;
-;;; Author: MORIOKA Tomohiko <morioka@jaist.ac.jp>
-;;; Maintainer: Shuhei KOBAYASHI <shuhei-k@jaist.ac.jp>
-;;;         and MORIOKA Tomohiko <morioka@jaist.ac.jp>
-;;; Version:
-;;;    $Id: mime-setup.el.in,v 7.23 1996/08/10 12:04:21 morioka Exp $
-;;; Keywords: mail, news, MIME, multimedia, multilingual, encoded-word
-;;;
-;;; This file is part of tm (Tools for MIME).
-;;;
-;;; This program 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.
-;;;
-;;; This program 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 This program.  If not, write to the Free Software
-;;; Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
-;;;
+
+;; Copyright (C) 1995,1996,1997 Free Software Foundation, Inc.
+
+;; Author: MORIOKA Tomohiko <morioka@jaist.ac.jp>
+;; Version:
+;;     $Id: mime-setup.el.in,v 7.31 1997/01/30 09:10:29 morioka Exp $
+;; Keywords: mail, news, MIME, multimedia, multilingual, encoded-word
+
+;; This file is part of tm (Tools for MIME).
+
+;; This program 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.
+
+;; This program 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., 59 Temple Place - Suite 330,
+;; Boston, MA 02111-1307, USA.
+
 ;;; Code:
 
 (require 'tm-setup)
@@ -58,10 +55,18 @@
 ;;; @ variables
 ;;;
 
-(defvar mime-setup-use-sc nil)
-(defvar mime-setup-use-signature t)
-(defvar mime-setup-default-signature-key "\C-c\C-s")
-(defvar mime-setup-signature-key-alist '((mail-mode . "\C-c\C-w")))
+(defvar mime-setup-use-sc nil
+  "If it is not nil, mime-setup requires sc-setup. [mime-setup.el]")
+
+(defvar mime-setup-use-signature t
+  "If it is not nil, mime-setup sets up to use signature.el.
+\[mime-setup.el]")
+
+(defvar mime-setup-default-signature-key "\C-c\C-s"
+  "*Key to insert signature. [mime-setup.el]")
+
+(defvar mime-setup-signature-key-alist '((mail-mode . "\C-c\C-w"))
+  "Alist of major-mode vs. key to insert signature. [mime-setup.el]")
 
 
 ;;; @ for signature
@@ -97,13 +102,18 @@
 (add-hook 'mu-cite/pre-cite-hook 'mime/decode-message-header)
 
 
-;;; @ for RMAIL and VM
+;;; @ for mail-mode, RMAIL and VM
 ;;;
 
 (add-hook 'mail-setup-hook 'mime/decode-message-header)
 (add-hook 'mail-setup-hook 'mime/editor-mode 'append)
 (add-hook 'mail-send-hook  'mime-editor/maybe-translate)
-
+(set-alist 'mime-editor/split-message-sender-alist
+           'mail-mode (function
+                       (lambda ()
+                         (interactive)
+                         (funcall send-mail-function)
+                         )))
 
 ;;; @ for mh-e
 ;;;
@@ -136,16 +146,33 @@
 ;;; @ for message (September Gnus 0.58 or later)
 ;;;
 
-(add-hook 'message-setup-hook 'mime/editor-mode)
-(add-hook 'message-send-hook  'mime-editor/maybe-translate)
-(add-hook 'message-header-hook 'mime/encode-message-header)
+(defun message-maybe-setup-default-charset ()
+  (let ((charset
+        (and (boundp 'gnus-summary-buffer)
+              (buffer-live-p gnus-summary-buffer)
+             (save-excursion
+               (set-buffer gnus-summary-buffer)
+               default-mime-charset))))
+    (if charset
+       (progn
+         (make-local-variable 'default-mime-charset)
+         (setq default-mime-charset charset)
+         ))))
 
-(call-after-loaded
- 'message
- (function
-  (lambda ()
-    (require 'message-mime)
-    )))
+(or (boundp 'epoch::version)
+    (progn
+      (add-hook 'message-setup-hook 'mime/editor-mode)
+      (add-hook 'message-setup-hook 'message-maybe-setup-default-charset)
+      (add-hook 'message-send-hook  'mime-editor/maybe-translate)
+      (add-hook 'message-header-hook 'mime/encode-message-header)
+      
+      (call-after-loaded
+       'message
+       (function
+       (lambda ()
+         (require 'message-mime)
+         )))
+      ))
 
 
 ;;; @ end