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

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

diff --git a/mime-setup.el b/mime-setup.el
index e611caf..816c708 100644 (file)
--- a/mime-setup.el
+++ b/mime-setup.el
@@ -2,11 +2,11 @@
 ;;; mime-setup.el --- setup file for tm viewer and composer.
 ;;;
 ;;; Copyright (C) 1995 Free Software Foundation, Inc.
-;;; Copyright (C) 1994,1995 MORIOKA Tomohiko
+;;; Copyright (C) 1994 .. 1996 MORIOKA Tomohiko
 ;;;
 ;;; Author: MORIOKA Tomohiko <morioka@jaist.ac.jp>
 ;;; Version:
-;;;    $Id: mime-setup.el,v 7.12 1995/11/29 21:51:05 morioka Exp $
+;;;    $Id: mime-setup.el,v 7.14 1996/02/14 09:15:36 morioka Exp $
 ;;; Keywords: mail, news, MIME, multimedia, multilingual, encoded-word
 ;;;
 ;;; This file is part of tm (Tools for MIME).
@@ -24,6 +24,8 @@
 ;;; 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.
+;;;
+;;; Code:
 
 (require 'tm-setup)
 
@@ -32,23 +34,23 @@
 (autoload 'mime/decode-message-header "tm-ew-d"
   "Decode MIME encoded-words in message header." t)
 
-(add-hook 'mime/editor-mode-hook
-         (function
-          (lambda ()
-            (save-excursion
-              (save-restriction
-                (goto-char (point-min))
-                (narrow-to-region
-                 (point-min)
-                 (if (re-search-forward
-                      (concat "^" (regexp-quote mail-header-separator) "$")
-                      nil t)
-                     (match-beginning 0)
-                   (point-max)
-                   ))
-                (mime/decode-message-header)
-                (set-buffer-modified-p nil)
-                )))))
+(defun mime-setup-decode-message-header ()
+  (save-excursion
+    (save-restriction
+      (goto-char (point-min))
+      (narrow-to-region
+       (point-min)
+       (if (re-search-forward
+           (concat "^" (regexp-quote mail-header-separator) "$")
+           nil t)
+          (match-beginning 0)
+        (point-max)
+        ))
+      (mime/decode-message-header)
+      (set-buffer-modified-p nil)
+      )))
+
+(add-hook 'mime/editor-mode-hook 'mime-setup-decode-message-header)
 
 
 ;;; @ variables
@@ -63,20 +65,16 @@
 ;;; @ for signature
 ;;;
 
+(defun mime-setup-set-signature-key ()
+  (let ((key (or (cdr (assq major-mode mime-setup-signature-key-alist))
+                mime-setup-default-signature-key)))
+    (define-key (current-local-map) key (function insert-signature))
+    ))
+
 (if mime-setup-use-signature
     (progn
       (autoload 'insert-signature "signature" "Insert signature" t)
-      (add-hook 'mime/editor-mode-hook
-               (function
-                (lambda ()
-                  (let ((key (or (cdr
-                                  (assq major-mode
-                                        mime-setup-signature-key-alist)
-                                  )
-                                 mime-setup-default-signature-key)))
-                    (define-key (current-local-map)
-                      key (function insert-signature))
-                    ))))
+      (add-hook 'mime/editor-mode-hook 'mime-setup-set-signature-key)
       (setq gnus-signature-file nil)
       (setq mail-signature nil)
       ))
@@ -101,22 +99,21 @@
 ;;; @ for mh-e
 ;;;
 
-(add-hook 'mh-letter-mode-hook
-         (function
-          (lambda ()
-            (mime/editor-mode)
-            (make-local-variable 'mail-header-separator)
-            (setq mail-header-separator "--------")
-            (save-excursion
-              (goto-char (point-min))
-              (if (re-search-forward "^-*$" nil t)
-                  (progn
-                    (replace-match mail-header-separator)
-                    (set-buffer-modified-p (buffer-modified-p))
-                    ))
-              )
-            )) t)
-
+(defun mime-setup-mh-draft-setting ()
+  (mime/editor-mode)
+  (make-local-variable 'mail-header-separator)
+  (setq mail-header-separator "--------")
+  (save-excursion
+    (goto-char (point-min))
+    (setq buffer-read-only nil)
+    (if (re-search-forward "^-*$" nil t)
+       (progn
+         (replace-match mail-header-separator)
+         (set-buffer-modified-p (buffer-modified-p))
+         ))
+    ))
+
+(add-hook 'mh-letter-mode-hook 'mime-setup-mh-draft-setting t)
 (add-hook 'mh-before-send-letter-hook 'mime-editor/maybe-translate)
 
 
@@ -133,3 +130,5 @@
 (provide 'mime-setup)
 
 (run-hooks 'mime-setup-load-hook)
+
+;;; mime-setup.el ends here