(mime-magic-type-alist): New variable; abolish

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

diff --git a/mime-edit.el b/mime-edit.el
index 4924c8d..0d28389 100644 (file)
--- a/mime-edit.el
+++ b/mime-edit.el
@@ -112,7 +112,6 @@
 (require 'mail-utils)
 (require 'mel)
 (require 'mime-view)
-(require 'eword-encode)
 (require 'signature)
 (require 'alist)
 
@@ -121,9 +120,10 @@
 ;;;
 
 (defconst mime-edit-version-string
-  `,(concat (car mime-module-version) " "
-           (mapconcat #'number-to-string (cddr mime-module-version) ".")
-           " - \"" (cadr mime-module-version) "\""))
+  `,(concat (car mime-user-interface-version) " "
+           (mapconcat #'number-to-string
+                      (cddr mime-user-interface-version) ".")
+           " - \"" (cadr mime-user-interface-version) "\""))
 
 
 ;;; @ variables
@@ -214,9 +214,13 @@ To insert a signature file automatically, call the function
        ("tftp"        ("site") ("name"))
        ("afs"         ("site") ("name"))
        ("local-file"  ("site") ("name"))
-       ("mail-server" ("server" "ftpmail@nic.karrn.ad.jp"))
+       ("mail-server"
+       ("server" "ftpmail@nic.karrn.ad.jp")
+       ("subject"))
+       ("url"         ("url"))
        ))
      ("rfc822")
+     ("news")
      )
     ("application"
      ("octet-stream" ("type" "" "tar" "shar"))
@@ -509,8 +513,11 @@ If it is not specified for a major-mode,
 (defconst mime-edit-split-ignored-field-regexp
   "\\(^Content-\\|^Subject:\\|^Mime-Version:\\|Message-Id:\\)")
 
-(defvar mime-edit-split-blind-field-regexp
-  "\\(^[BDFbdf]cc:\\|^cc:[ \t]*$\\)")
+(defcustom mime-edit-split-blind-field-regexp
+  "\\(^[BDFbdf]cc:\\|^cc:[ \t]*$\\)"
+  "*Regular expression to match field-name to be ignored when split sending."
+  :group 'mime-edit
+  :type 'regexp)
 
 (defvar mime-edit-split-message-sender-alist nil)
 
@@ -697,7 +704,7 @@ Tspecials means any character that matches with it in header must be quoted.")
        ;; modified by Pekka Marjola <pema@iki.fi>
        ;;      1995/9/5 (c.f. [tm-en:69])
        (defun mime-edit-define-menu-for-xemacs ()
-        "Define menu for Emacs 19."
+        "Define menu for XEmacs."
         (cond ((featurep 'menubar)
                (make-local-variable 'current-menubar)
                (set-buffer-menubar current-menubar)
@@ -2481,7 +2488,7 @@ Content-Type: message/partial; id=%s; number=%d; total=%d\n%s\n"
         (concat "^" (regexp-quote separator) "$"))
        (replace-match "")
       )
-    (mime-view-mode)
+    (mime-view-buffer)
     ))
 
 (defun mime-edit-quitting-method ()