Sync up with APEL 8.0.9

diff --git a/APEL-ELS b/APEL-ELS
index 82fb729..54e5e07 100644 (file)
--- a/APEL-ELS
+++ b/APEL-ELS
@@ -1,11 +1,10 @@
 ;;; -*-Emacs-Lisp-*-
 ;;;
-;;; $Id: APEL-ELS,v 1.7 1998-03-15 11:48:02 morioka Exp $
+;;; $Id: APEL-ELS,v 1.7.2.1 1998-04-11 14:08:10 morioka Exp $
 ;;;
 
 (setq apel-modules '(alist calist atype
                           path-util filename install
-                          std11 std11-parse
                           mule-caesar
                           file-detect))
 

diff --git a/ChangeLog b/ChangeLog
index 8ee8bad..94032a9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+1998-04-11  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
+
+       * emu-x20.el (encode-mime-charset-region): Use 'defun instead of
+       'defsubst.
+       (decode-mime-charset-region): Use 'defun instead of 'defsubst.
+
+1998-04-10  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
+
+       * APEL-ELS (apel-modules): Delete 'std11 and 'std11-parse.
+
+       * std11.el, std11-parse.el: Abolish std11-parse.el and std11.el
+       (moved to RIME).
+
 1998-04-09  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
 
        * emu-e19.el, emu-e20.el: Use 'make-obsolete for 'string-columns.

diff --git a/emu-x20.el b/emu-x20.el
index 370c95d..e9bffcc 100644 (file)
--- a/emu-x20.el
+++ b/emu-x20.el
@@ -70,7 +70,7 @@ find-file-hooks, etc.
 ;;; @ MIME charset
 ;;;
 
-(defsubst encode-mime-charset-region (start end charset)
+(defun encode-mime-charset-region (start end charset)
   "Encode the text between START and END as MIME CHARSET."
   (let ((cs (mime-charset-to-coding-system charset)))
     (if cs
@@ -134,7 +134,7 @@ find-file-hooks, etc.
            ))
        (setq rest (cdr rest))))))
 
-(defsubst decode-mime-charset-region (start end charset)
+(defun decode-mime-charset-region (start end charset)
   "Decode the text between START and END as MIME CHARSET."
   (if (stringp charset)
       (setq charset (intern (downcase charset)))