(tm:add-button): Use `add-text-properties' directly.

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

diff --git a/mime-setup.el b/mime-setup.el
index e40434b..43e38a1 100644 (file)
--- a/mime-setup.el
+++ b/mime-setup.el
@@ -4,7 +4,7 @@
 
 ;; Author: MORIOKA Tomohiko <morioka@jaist.ac.jp>
 ;; Version:
-;;     $Id: mime-setup.el,v 0.1 1997-02-21 05:55:53 tmorioka Exp $
+;;     $Id: mime-setup.el,v 0.7 1997-02-24 02:42:24 tmorioka Exp $
 ;; Keywords: MIME, multimedia, multilingual, mail, news
 
 ;; This file is part of SEMI (SEMI is Emacs MIME Interfaces).
@@ -28,10 +28,10 @@
 
 (require 'semi-setup)
 
-(autoload 'mime/editor-mode "tm-edit"
+(autoload 'mime-edit-mode "mime-edit"
   "Minor mode for editing MIME message." t)
-(autoload 'mime/decode-message-header "tm-ew-d"
-  "Decode MIME encoded-words in message header." t)
+(autoload 'eword-decode-header "eword-decode"
+  "Decode MIME encoded-words in header fields." t)
 
 (defun mime-setup-decode-message-header ()
   (save-excursion
@@ -45,19 +45,16 @@
           (match-beginning 0)
         (point-max)
         ))
-      (mime/decode-message-header)
+      (eword-decode-header)
       (set-buffer-modified-p nil)
       )))
 
-(add-hook 'mime/editor-mode-hook 'mime-setup-decode-message-header)
+(add-hook 'mime-edit-mode-hook 'mime-setup-decode-message-header)
 
 
 ;;; @ variables
 ;;;
 
-(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]")
@@ -81,34 +78,26 @@
 (if mime-setup-use-signature
     (progn
       (autoload 'insert-signature "signature" "Insert signature" t)
-      (add-hook 'mime/editor-mode-hook 'mime-setup-set-signature-key)
+      (add-hook 'mime-edit-mode-hook 'mime-setup-set-signature-key)
       (setq gnus-signature-file nil)
       (setq mail-signature nil)
       (setq message-signature nil)
       ))
 
 
-;;; @ about SuperCite
-;;;
-
-(if mime-setup-use-sc
-    (require 'sc-setup)
-  )
-
-
 ;;; @ for mu-cite
 ;;;
 
-(add-hook 'mu-cite/pre-cite-hook 'mime/decode-message-header)
+(add-hook 'mu-cite/pre-cite-hook 'eword-decode-header)
 
 
 ;;; @ 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
+(add-hook 'mail-setup-hook 'eword-decode-header)
+(add-hook 'mail-setup-hook 'mime-edit-mode 'append)
+(add-hook 'mail-send-hook  'mime-edit-maybe-translate)
+(set-alist 'mime-edit-split-message-sender-alist
            'mail-mode (function
                        (lambda ()
                          (interactive)
@@ -119,7 +108,7 @@
 ;;;
 
 (defun mime-setup-mh-draft-setting ()
-  (mime/editor-mode)
+  (mime-edit-mode)
   (make-local-variable 'mail-header-separator)
   (setq mail-header-separator "--------")
   (save-excursion
@@ -133,14 +122,7 @@
     ))
 
 (add-hook 'mh-letter-mode-hook 'mime-setup-mh-draft-setting t)
-(add-hook 'mh-before-send-letter-hook 'mime-editor/maybe-translate)
-
-
-;;; @ for GNUS
-;;;
-
-(add-hook 'news-reply-mode-hook 'mime/editor-mode)
-(add-hook 'news-inews-hook      'mime-editor/maybe-translate)
+(add-hook 'mh-before-send-letter-hook 'mime-edit-maybe-translate)
 
 
 ;;; @ for message (September Gnus 0.58 or later)
@@ -161,10 +143,10 @@
 
 (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-setup-hook  'mime-edit-mode)
+      (add-hook 'message-setup-hook  'message-maybe-setup-default-charset)
+      (add-hook 'message-send-hook   'mime-edit-maybe-translate)
+      (add-hook 'message-header-hook 'eword-encode-header)
       
       (call-after-loaded
        'message