Modify header.

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

diff --git a/mime-def.el b/mime-def.el
index af5a414..828f244 100644 (file)
--- a/mime-def.el
+++ b/mime-def.el
@@ -1,12 +1,11 @@
 ;;; mime-def.el --- definition module for SEMI
 
-;; Copyright (C) 1995,1996,1997 Free Software Foundation, Inc.
+;; Copyright (C) 1995,1996,1997,1998 Free Software Foundation, Inc.
 
 ;; Author: MORIOKA Tomohiko <morioka@jaist.ac.jp>
-;; Version: $Id: mime-def.el,v 0.61 1997-08-30 14:26:57 morioka Exp $
 ;; Keywords: definition, MIME, multimedia, mail, news
 
-;; This file is part of SEMI (SEMI is Emacs MIME Interfaces).
+;; This file is part of SEMI (Spadework 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
@@ -25,10 +24,35 @@
 
 ;;; Code:
 
-(require 'cl)
 (require 'emu)
+(require 'custom)
+
+(defgroup mime nil
+  "Emacs MIME Interfaces"
+  :group 'news
+  :group 'mail)
+
+(custom-handle-keyword 'default-mime-charset :group 'mime
+                      'custom-variable)
+
+(unless (fboundp 'butlast)
+  (defun butlast (x &optional n)
+    "Returns a copy of LIST with the last N elements removed."
+    (if (and n (<= n 0)) x
+      (nbutlast (copy-sequence x) n)))
+  
+  (defun nbutlast (x &optional n)
+    "Modifies LIST to remove the last N elements."
+    (let ((m (length x)))
+      (or n (setq n 1))
+      (and (< n m)
+          (progn
+            (if (> n 0) (setcdr (nthcdr (- (1- m) n) x) nil))
+            x))))
+  )
 
-(defconst semi-version-name "Tsurugi")
+(defconst semi-version '("Oshino" 1 1 1)
+  "Version name and numbers of SEMI-kernel package.")
 
 (autoload 'mule-caesar-region "mule-caesar"
   "Caesar rotation of current region." t)
@@ -59,8 +83,8 @@
 ;;; @ definitions about MIME
 ;;;
 
-(defconst mime-tspecials "][\000-\040()<>@,\;:\\\"/?.=")
-(defconst mime-token-regexp (concat "[^" mime-tspecials "]+"))
+(defconst mime-tspecials "][()<>@,\;:\\\"/?=")
+(defconst mime-token-regexp (concat "[^" mime-tspecials "\000-\040]+"))
 (defconst mime-charset-regexp mime-token-regexp)
 
 (defconst mime-media-type/subtype-regexp
@@ -70,11 +94,15 @@
 ;;; @ button
 ;;;
 
-(defvar mime-button-face 'bold
-  "Face used for content-button or URL-button of MIME-Preview buffer.")
+(defcustom mime-button-face 'bold
+  "Face used for content-button or URL-button of MIME-Preview buffer."
+  :group 'mime
+  :type 'face)
 
-(defvar mime-button-mouse-face 'highlight
-  "Face used for MIME-preview buffer mouse highlighting.")
+(defcustom mime-button-mouse-face 'highlight
+  "Face used for MIME-preview buffer mouse highlighting."
+  :group 'mime
+  :type 'face)
 
 (defsubst mime-add-button (from to function &optional data)
   "Create a button between FROM and TO with callback FUNCTION and DATA."
@@ -97,7 +125,7 @@
     ;; (widget-push-button-value-create
     ;;  (widget-convert 'push-button
     ;;                  :notify (lambda (&rest ignore)
-    ;;                            (mime-view-play-current-entity)
+    ;;                            (mime-preview-play-current-entity)
     ;;                            )
     ;;                  string))
     (insert "\n")
@@ -159,12 +187,12 @@ FUNCTION.")
 
 (defmacro pgp-function (method)
   "Return function to do service METHOD."
-  (` (car (cdr (assq (, method) (symbol-value 'pgp-function-alist)))))
+  `(cadr (assq ,method (symbol-value 'pgp-function-alist)))
   )
 
 (mapcar (function
         (lambda (method)
-          (autoload (second method)(third method))
+          (autoload (cadr method)(nth 2 method))
           ))
        pgp-function-alist)