tm 7.93.

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

diff --git a/mime-setup.el.in b/mime-setup.el.in
index e8d473e..d9fe8d1 100644 (file)
--- a/mime-setup.el.in
+++ b/mime-setup.el.in
@@ -3,9 +3,8 @@
 ;; Copyright (C) 1995,1996 Free Software Foundation, Inc.
 
 ;; Author: MORIOKA Tomohiko <morioka@jaist.ac.jp>
-;; Maintainer: Shuhei KOBAYASHI <shuhei-k@jaist.ac.jp>
 ;; Version:
-;;     $Id: mime-setup.el.in,v 7.25 1996/08/18 17:03:42 morioka Exp $
+;;     $Id: mime-setup.el.in,v 7.28 1996/09/21 17:51:46 morioka Exp $
 ;; Keywords: mail, news, MIME, multimedia, multilingual, encoded-word
 
 ;; This file is part of tm (Tools for MIME).
@@ -21,8 +20,8 @@
 ;; General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program; see the file COPYING.  If not, write to
-;; the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+;; 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:
@@ -56,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
@@ -134,9 +141,22 @@
 ;;; @ for message (September Gnus 0.58 or later)
 ;;;
 
+(defun message-maybe-setup-default-charset ()
+  (let ((charset
+        (and (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)
+         ))))
+
 (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)