X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=tm-def.el;h=bd80377007536e64a34fa08130546e42f37ef1b3;hb=3fe76b044cf6350e4fddadbc8e3c12af0a97866b;hp=6d920e3fd3a2d373f98de860a81653b5a0782965;hpb=f3059d264de1ed04e959a2392afdf35a501a167c;p=elisp%2Ftm.git

diff --git a/tm-def.el b/tm-def.el
index 6d920e3..bd80377 100644
--- a/tm-def.el
+++ b/tm-def.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 1995,1996 Free Software Foundation, Inc.
 
 ;; Author: MORIOKA Tomohiko <morioka@jaist.ac.jp>
-;; Version: $Id: tm-def.el,v 7.63 1996/09/05 09:08:31 morioka Exp $
+;; Version: $Id: tm-def.el,v 7.69 1997/01/21 06:13:15 shuhei-k Exp $
 ;; Keywords: mail, news, MIME, multimedia, definition
 
 ;; This file is part of tm (Tools for MIME).
@@ -19,14 +19,13 @@
 ;; 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:
 
 (require 'emu)
-(require 'tl-822)
 
 
 ;;; @ variables
@@ -105,8 +104,15 @@
     (tl:overlay-put overlay 'face face)
     ))
 
-(setq tm:button-face 'bold)
-(setq tm:mouse-face 'highlight)
+(defvar tm:button-face 'bold
+  "Face used for content-button or URL-button of MIME-Preview buffer.
+\[tm-def.el]")
+
+(defvar tm:mouse-face 'highlight
+  "Face used for MIME-preview buffer mouse highlighting. [tm-def.el]")
+
+(defvar tm:warning-face nil
+  "Face used for invalid encoded-word.")
 
 (defun tm:add-button (from to func &optional data)
   "Create a button between FROM and TO with callback FUNC and data DATA."
@@ -173,10 +179,6 @@
 
 (defconst mime/content-type-subtype-regexp
   (concat mime/token-regexp "/" mime/token-regexp))
-(defconst mime/content-parameter-value-regexp
-  (concat "\\("
-	  rfc822/quoted-string-regexp
-	  "\\|[^; \t\n]*\\)"))
 
 (defconst mime/disposition-type-regexp mime/token-regexp)
 
@@ -184,15 +186,22 @@
 ;;; @@ Base64
 ;;;
 
-(defconst base64-token-regexp "[A-Za-z0-9+/=]")
+(defconst base64-token-regexp "[A-Za-z0-9+/]")
+(defconst base64-token-padding-regexp "[A-Za-z0-9+/=]")
 
 (defconst mime/B-encoded-text-regexp
-  (concat "\\("
+  (concat "\\(\\("
+	  base64-token-regexp
 	  base64-token-regexp
 	  base64-token-regexp
 	  base64-token-regexp
+	  "\\)*"
 	  base64-token-regexp
-	  "\\)+"))
+	  base64-token-regexp
+	  base64-token-padding-regexp
+	  base64-token-padding-regexp
+          "\\)"))
+
 (defconst mime/B-encoding-and-encoded-text-regexp
   (concat "\\(B\\)\\?" mime/B-encoded-text-regexp))