Move binary access features to emu-e20.el again.

[elisp/apel.git] / emu-e20.el

diff --git a/emu-e20.el b/emu-e20.el
index 1dec5ef..3c606d1 100644 (file)
--- a/emu-e20.el
+++ b/emu-e20.el
@@ -1,9 +1,8 @@
-;;; emu-e20.el --- emu API implementation for Emacs/mule (19.34.91-delta)
+;;; emu-e20.el --- emu API implementation for Emacs 20.1 and 20.2
 
-;; Copyright (C) 1996,1997 Free Software Foundation, Inc.
+;; Copyright (C) 1996,1997,1998 Free Software Foundation, Inc.
 
 ;; Author: MORIOKA Tomohiko <morioka@jaist.ac.jp>
-;; Version: $Id: emu-e20.el,v 7.22 1997/08/30 07:46:40 morioka Exp $
 ;; Keywords: emulation, compatibility, Mule
 
 ;; This file is part of emu.
@@ -25,11 +24,11 @@
 
 ;;; Commentary:
 
-;;    This module requires Emacs 20.0.90 or later.
+;;    This module requires Emacs 20.1 and 20.2.
 
 ;;; Code:
 
-(require 'emu-19)
+(require 'emu-e19)
 
 (defun fontset-pixel-size (fontset)
   (let* ((info (fontset-info fontset))
@@ -44,8 +43,6 @@
          (t 0)
          )))
 
-(require 'emu-20)
-
 
 ;;; @ character set
 ;;;
@@ -67,6 +64,11 @@ in the region between START and END."
 ;;; @ coding system
 ;;;
 
+(defsubst-maybe find-coding-system (obj)
+  "Return OBJ if it is a coding-system."
+  (if (coding-system-p obj)
+      obj))
+
 (defalias 'set-process-input-coding-system 'set-process-coding-system)
 
 
@@ -114,11 +116,6 @@ in the region between START and END."
 ;;; @ character
 ;;;
 
-(defalias 'char-length 'char-bytes)
-
-(defalias 'char-columns 'char-width)
-
-
 ;;; @@ Mule emulating aliases
 ;;;
 ;;; You should not use them.
@@ -131,32 +128,12 @@ TABLE defaults to the current buffer's category table."
   )
 
 
-;;; @ string
-;;;
-
-(defalias 'string-columns 'string-width)
-
-(defalias 'sset 'store-substring)
-
-(defun string-to-char-list (string)
-  "Return a list of which elements are characters in the STRING."
-  (let* ((len (length string))
-        (i 0)
-        l chr)
-    (while (< i len)
-      (setq chr (sref string i))
-      (setq l (cons chr l))
-      (setq i (+ i (char-bytes chr)))
-      )
-    (nreverse l)
-    ))
-
-(defalias 'string-to-int-list 'string-to-char-list)
-
-
 ;;; @ end
 ;;;
 
+(require 'emu-e20_2)
+(require 'emu-20)
+
 (provide 'emu-e20)
 
 ;;; emu-e20.el ends here