merge from semi-1_14

diff --git a/ChangeLog b/ChangeLog
index cb78141..5699025 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
-2004-07-25  Yoichi NAKAYAMA  <yoichi@geiin.org>
+2004-07-27  Yoichi NAKAYAMA  <yoichi@geiin.org>
 
-       * mel-g.el (TopLevel): Cause error when "mmencode" is not found.
+       * mel-g.el (gzip64-external-encoder): Change default value to
+       cause more recognizable error.
+       (gzip64-external-decoder): Ditto.
 
 2004-06-09  Yoichi NAKAYAMA  <yoichi@geiin.org>
 

diff --git a/mel-g.el b/mel-g.el
index aa8b9f3..320af70 100644 (file)
--- a/mel-g.el
+++ b/mel-g.el
@@ -39,20 +39,12 @@
 ;;; @ 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.")
 
-(unless (and gzip64-external-encoder gzip64-external-decoder)
-  (error "Please install mmencode command."))
 
 ;;; @ encoder/decoder for region
 ;;;