--- a/lisp/mel/mel-g.el	Mon Aug 13 09:00:04 2007 +0200
+++ b/lisp/mel/mel-g.el	Mon Aug 13 09:02:59 2007 +0200
@@ -1,53 +1,45 @@
+;;;
 ;;; mel-g.el: Gzip64 encoder/decoder for GNU Emacs
-
-;; Copyright (C) 1995,1996,1997 MORIOKA Tomohiko
-;; Copyright (C) 1996 Shuhei KOBAYASHI
-
-;; Author: Shuhei KOBAYASHI <shuhei-k@jaist.ac.jp>
-;;	modified by MORIOKA Tomohiko <morioka@jaist.ac.jp>
-;; Maintainer: Shuhei KOBAYASHI <shuhei-k@jaist.ac.jp>
-;; Created: 1995/10/25
-;; Version: $Id: mel-g.el,v 1.6 1997/03/16 05:55:17 steve Exp $
-;; Keywords: Gzip64, base64, gzip, MIME
-
-;; This file is not part of MEL (MIME Encoding Library) yet.
-
-;; This program is free software; you can redistribute it and/or
-;; modify it under the terms of the GNU General Public License as
-;; published by the Free Software Foundation; either version 2, or (at
-;; your option) any later version.
-
-;; This program is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-;; General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; 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.
-
+;;;
+;;; Copyright (C) 1995,1996 MORIOKA Tomohiko
+;;; Copyright (C) 1996 Shuhei KOBAYASHI
+;;;
+;;; Author: Shuhei KOBAYASHI <shuhei-k@jaist.ac.jp>
+;;;         modified by MORIOKA Tomohiko <morioka@jaist.ac.jp>
+;;; Maintainer: Shuhei KOBAYASHI <shuhei-k@jaist.ac.jp>
+;;; Created: 1995/10/25
+;;; Version:
+;;;	$Id: mel-g.el,v 1.1.1.1 1996/12/18 22:43:39 steve Exp $
+;;; Keywords: MIME, base64, gzip
+;;;
+;;; This file is not part of MEL (MIME Encoding Library) yet.
+;;;
+;;; This program is free software; you can redistribute it and/or
+;;; modify it under the terms of the GNU General Public License as
+;;; published by the Free Software Foundation; either version 2, or
+;;; (at your option) any later version.
+;;;
+;;; This program is distributed in the hope that it will be useful,
+;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;;; General Public License for more details.
+;;;
+;;; 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 'emu)
-(require 'file-detect)
 
 
 ;;; @ variables
 ;;;
 
-(defvar gzip64-external-encoder
-  (let ((file (exec-installed-p "mmencode")))
-    (and file
-	 (` ("sh" "-c" (, (concat "gzip -c | " file))))
-	 ))
+(defvar gzip64-external-encoder '("sh" "-c" "gzip -c | mmencode")
   "*list of gzip64 encoder program name and its arguments.")
 
-(defvar gzip64-external-decoder
-  (let ((file (exec-installed-p "mmencode")))
-    (and file
-	 (` ("sh" "-c" (, (concat file " -u | gzip -dc"))))
-	 ))
+(defvar gzip64-external-decoder '("sh" "-c" "mmencode -u | gzip -dc")
   "*list of gzip64 decoder program name and its arguments.")