--- a/lisp/mel/mel.el	Mon Aug 13 09:00:04 2007 +0200
+++ b/lisp/mel/mel.el	Mon Aug 13 09:02:59 2007 +0200
@@ -1,11 +1,11 @@
 ;;; mel.el : a MIME encoding/decoding library
 
-;; Copyright (C) 1995,1996,1997 Free Software Foundation, Inc.
+;; Copyright (C) 1995,1996 Free Software Foundation, Inc.
 
 ;; Author: MORIOKA Tomohiko <morioka@jaist.ac.jp>
 ;; modified by Shuhei KOBAYASHI <shuhei-k@jaist.ac.jp>
 ;; Created: 1995/6/25
-;; Version: $Id: mel.el,v 1.4 1997/03/22 05:29:07 steve Exp $
+;; Version: $Id: mel.el,v 1.1.1.1 1996/12/18 22:43:38 steve Exp $
 ;; Keywords: MIME, Base64, Quoted-Printable, uuencode, gzip64
 
 ;; This file is part of MEL (MIME Encoding Library).
@@ -27,26 +27,13 @@
 
 ;;; Code:
 
-;;; @ variable
-;;;
-
-(defvar mime-temp-directory (or (getenv "MIME_TMP_DIR")
-				(getenv "TM_TMP_DIR")
-				"/tmp/")
-  "*Directory for temporary files.")
-
-
 ;;; @ region
 ;;;
 
-(autoload 'base64-encode-region
-  "mel-b" "Encode current region by base64." t)
-(autoload 'quoted-printable-encode-region
-  "mel-q" "Encode current region by Quoted-Printable." t)
-(autoload 'uuencode-encode-region
-  "mel-u" "Encode current region by unofficial uuencode format." t)
-(autoload 'gzip64-encode-region
-  "mel-g" "Encode current region by unofficial x-gzip64 format." t)
+(autoload 'base64-encode-region           "mel-b" nil t)
+(autoload 'quoted-printable-encode-region "mel-q" nil t)
+(autoload 'uuencode-encode-region         "mel-u" nil t)
+(autoload 'gzip64-encode-region           "mel-g" nil t)
 
 (defvar mime-encoding-method-alist
   '(("base64"           . base64-encode-region)
@@ -56,37 +43,22 @@
     ("7bit")
     ("8bit")
     ("binary")
-    )
-  "Alist of encoding vs. corresponding method to encode region.
-Each element looks like (STRING . FUNCTION) or (STRING . nil).
-STRING is content-transfer-encoding.
-FUNCTION is region encoder and nil means not to encode.")
-
+    ))
 
-(autoload 'base64-decode-region
-  "mel-b" "Decode current region by base64." t)
-(autoload 'quoted-printable-decode-region
-  "mel-q" "Decode current region by Quoted-Printable." t)
-(autoload 'uuencode-decode-region
-  "mel-u" "Decode current region by unofficial uuencode format." t)
-(autoload 'gzip64-decode-region
-  "mel-g" "Decode current region by unofficial x-gzip64 format." t)
+(autoload 'base64-decode-region           "mel-b" nil t)
+(autoload 'quoted-printable-decode-region "mel-q" nil t)
+(autoload 'uuencode-decode-region         "mel-u" nil t)
+(autoload 'gzip64-decode-region		  "mel-g" nil t)
 
 (defvar mime-decoding-method-alist
   '(("base64"           . base64-decode-region)
     ("quoted-printable" . quoted-printable-decode-region)
     ("x-uue"            . uuencode-decode-region)
-    ("x-uuencode"       . uuencode-decode-region)
     ("x-gzip64"         . gzip64-decode-region)
-    )
-  "Alist of encoding vs. corresponding method to decode region.
-Each element looks like (STRING . FUNCTION).
-STRING is content-transfer-encoding.
-FUNCTION is region decoder.")
+    ))
 
-
-(defun mime-encode-region (start end encoding)
-  "Encode region START to END of current buffer using ENCODING."
+(defun mime-encode-region (beg end encoding)
+  "Encode region BEG to END of current buffer using ENCODING. [mel.el]"
   (interactive
    (list (region-beginning) (region-end)
 	 (completing-read "encoding: "
@@ -95,11 +67,11 @@
    )
   (let ((f (cdr (assoc encoding mime-encoding-method-alist))))
     (if f
-	(funcall f start end)
+	(funcall f beg end)
       )))
 
-(defun mime-decode-region (start end encoding)
-  "Decode region START to END of current buffer using ENCODING."
+(defun mime-decode-region (beg end encoding)
+  "Decode region BEG to END of current buffer using ENCODING. [mel.el]"
   (interactive
    (list (region-beginning) (region-end)
 	 (completing-read "encoding: "
@@ -108,21 +80,17 @@
    )
   (let ((f (cdr (assoc encoding mime-decoding-method-alist))))
     (if f
-	(funcall f start end)
+	(funcall f beg end)
       )))
 
 
 ;;; @ file
 ;;;
 
-(autoload 'base64-insert-encoded-file
-  "mel-b" "Insert file encoded by base64." t)
-(autoload 'quoted-printable-insert-encoded-file
-  "mel-q" "Insert file encoded by quoted-printable." t)
-(autoload 'uuencode-insert-encoded-file
-  "mel-u" "Insert file encoded by unofficial uuencode format." t)
-(autoload 'gzip64-insert-encoded-file
-  "mel-g" "Insert file encoded by unofficial gzip64 format." t)
+(autoload 'base64-insert-encoded-file           "mel-b" nil t)
+(autoload 'quoted-printable-insert-encoded-file "mel-q" nil t)
+(autoload 'uuencode-insert-encoded-file         "mel-u" nil t)
+(autoload 'gzip64-insert-encoded-file           "mel-g" nil t)
 
 (defvar mime-file-encoding-method-alist
   '(("base64"           . base64-insert-encoded-file)
@@ -132,14 +100,10 @@
     ("7bit"		. insert-binary-file-contents-literally)
     ("8bit"		. insert-binary-file-contents-literally)
     ("binary"		. insert-binary-file-contents-literally)
-    )
-  "Alist of encoding vs. corresponding method to insert encoded file.
-Each element looks like (STRING . FUNCTION).
-STRING is content-transfer-encoding.
-FUNCTION is function to insert encoded file.")
+    ))
 
 (defun mime-insert-encoded-file (filename encoding)
-  "Insert file FILENAME encoded by ENCODING format."
+  "Encode region BEG to END of current buffer using ENCODING. [mel.el]"
   (interactive
    (list (read-file-name "Insert encoded file: ")
 	 (completing-read "encoding: "