(bbdb-extract-field-value): Use `eword-decode-string' instead of

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

diff --git a/mime-setup.el.in b/mime-setup.el.in
index e8d473e..8977841 100644 (file)
--- a/mime-setup.el.in
+++ b/mime-setup.el.in
@@ -1,11 +1,8 @@
 ;;; mime-setup.el --- setup file for tm viewer and composer.
 
-;; Copyright (C) 1995,1996 Free Software Foundation, Inc.
+;; Copyright (C) 1995,1996,1997 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 $
 ;; Keywords: mail, news, MIME, multimedia, multilingual, encoded-word
 
 ;; This file is part of tm (Tools for MIME).
@@ -21,8 +18,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:
@@ -31,7 +28,7 @@
 
 (autoload 'mime/editor-mode "tm-edit"
   "Minor mode for editing MIME message." t)
-(autoload 'mime/decode-message-header "tm-ew-d"
+(autoload 'mime-decode-header-in-buffer "eword-decode"
   "Decode MIME encoded-words in message header." t)
 
 (defun mime-setup-decode-message-header ()
@@ -46,7 +43,7 @@
           (match-beginning 0)
         (point-max)
         ))
-      (mime/decode-message-header)
+      (mime-decode-header-in-buffer)
       (set-buffer-modified-p nil)
       )))
 
@@ -56,10 +53,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
@@ -92,16 +97,21 @@
 ;;; @ for mu-cite
 ;;;
 
-(add-hook 'mu-cite/pre-cite-hook 'mime/decode-message-header)
+(add-hook 'mu-cite/pre-cite-hook 'mime-decode-header-in-buffer)
 
 
-;;; @ 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-decode-header-in-buffer)
 (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
 ;;;
@@ -134,11 +144,25 @@
 ;;; @ for message (September Gnus 0.58 or later)
 ;;;
 
+(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)
+         ))))
+
 (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)
+      (add-hook 'message-header-hook 'eword-encode-header)
       
       (call-after-loaded
        'message