Sync with semi-1_14

[elisp/semi.git] / mail-mime-setup.el

diff --git a/mail-mime-setup.el b/mail-mime-setup.el
index efa7107..60c46aa 100644 (file)
--- a/mail-mime-setup.el
+++ b/mail-mime-setup.el
@@ -1,13 +1,11 @@
 ;;; mail-mime-setup.el --- setup file for mail-mode.
 
-;; Copyright (C) 1994,1995,1996,1997 Free Software Foundation, Inc.
+;; Copyright (C) 1994,1995,1996,1997,1998,2000 Free Software Foundation, Inc.
 
 ;; Author: MORIOKA Tomohiko <morioka@jaist.ac.jp>
-;; Version:
-;;     $Id: mail-mime-setup.el,v 0.0 1997-03-14 08:47:06 morioka Exp $
 ;; Keywords: mail-mode, MIME, multimedia, multilingual, encoded-word
 
-;; This file is part of SEMI (SEMI is Emacs MIME Interfaces).
+;; This file is part of SEMI (Setting for Emacs MIME Interfaces).
 
 ;; This program is free software; you can redistribute it and/or
 ;; modify it under the terms of the GNU General Public License as
@@ -27,27 +25,34 @@
 ;;; Code:
 
 (require 'semi-setup)
+(require 'alist)
 
 
 (autoload 'turn-on-mime-edit "mime-edit"
   "Unconditionally turn on MIME-Edit minor mode." t)
 
-(autoload 'eword-decode-header "eword-decode"
-  "Decode MIME encoded-words in header fields." t)
+;; (autoload 'eword-decode-header "eword-decode"
+;;   "Decode MIME encoded-words in header fields." t)
 
 
 ;;; @ for mail-mode, RMAIL and VM
 ;;;
 
-(add-hook 'mail-setup-hook 'eword-decode-header)
+;; (add-hook 'mail-setup-hook 'eword-decode-header)
 (add-hook 'mail-setup-hook 'turn-on-mime-edit 'append)
 (add-hook 'mail-send-hook  'mime-edit-maybe-translate)
 (set-alist 'mime-edit-split-message-sender-alist
            'mail-mode (function
                        (lambda ()
                          (interactive)
-                         (funcall send-mail-function)
-                         )))
+                         (funcall send-mail-function))))
+
+
+;;; @ for signature
+;;;
+
+(if mime-setup-use-signature
+    (setq mail-signature nil))
 
 
 ;;; @ end