Rename emu-19.el -> emu-e19.el.

diff --git a/EMU-ELS b/EMU-ELS
index a63a786..ea99b9a 100644 (file)
--- a/EMU-ELS
+++ b/EMU-ELS
@@ -1,6 +1,6 @@
 ;;; -*-Emacs-Lisp-*-
 ;;;
-;;; $Id: EMU-ELS,v 1.4 1998-04-16 12:52:48 morioka Exp $
+;;; $Id: EMU-ELS,v 1.5 1998-04-16 23:07:34 morioka Exp $
 ;;;
 
 (setq emu-modules
@@ -14,35 +14,32 @@
 
 (setq emu-modules
       (nconc
-       (cond (running-mule-merged-emacs
-             '(emu-e20 emu-20)
+       (cond (running-xemacs
+             ;; for XEmacs
+             (cons 'emu-xemacs
+                   (if (featurep 'mule)
+                       '(emu-20 emu-x20) ; for XEmacs with MULE
+                     '(emu-latin1))) ; for XEmacs without MULE
              )
-            (running-xemacs-with-mule
-             '(emu-x20 emu-20)
+            ((featurep 'mule)
+             ;; for Emacs 20.1 or later
+             '(emu-20 emu-e19 emu-e20)
              )
             ((boundp 'MULE)
-             '(emu-mule)
+             ;; for MULE 1.* and MULE 2.*
+             (cons 'emu-mule
+                   (if running-emacs-18
+                       '(emu-18 env)
+                     '(emu-e19)))
              )
             ((boundp 'NEMACS)
-             '(emu-nemacs)
+             ;; for NEmacs
+             '(emu-18 emu-nemacs)
              )
             (t
-             '(emu-latin1)
+             ;; for Emacs 19.34
+             '(emu-e19 emu-latin1)
              ))
        emu-modules))
 
-(setq emu-modules
-      (nconc
-       (cond (running-emacs-18
-             '(emu-18 env)
-             )
-            (running-xemacs
-             '(emu-xemacs)
-             )
-            (t
-             '(emu-19)
-             )
-            )
-       emu-modules))
-
 ;;; EMU-ELS ends here

diff --git a/emu-19.el b/emu-19.el
deleted file mode 100644 (file)
index 9207979..0000000
--- a/emu-19.el
+++ /dev/null
@@ -1,107 +0,0 @@
-;;; emu-19.el --- emu API implementation for Emacs 19.*
-
-;; Copyright (C) 1995,1996,1997 Free Software Foundation, Inc.
-
-;; Author: MORIOKA Tomohiko <morioka@jaist.ac.jp>
-;; Version: $Id: emu-19.el,v 7.18 1997/11/06 10:38:03 morioka Exp $
-;; Keywords: emulation, compatibility
-
-;; This file is part of emu.
-
-;; 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.
-
-;;; Code:
-
-;;; @ face
-;;;
-
-(defun-maybe find-face (face)
-  (car (memq face (face-list)))
-  )
-
-
-;;; @ for tm-7.106
-;;;
-
-(defalias 'tl:make-overlay 'make-overlay)
-(defalias 'tl:overlay-put 'overlay-put)
-(defalias 'tl:overlay-buffer 'overlay-buffer)
-
-(make-obsolete 'tl:make-overlay 'make-overlay)
-(make-obsolete 'tl:overlay-put 'overlay-put)
-(make-obsolete 'tl:overlay-buffer 'overlay-buffer)
-
-
-;;; @ visible/invisible
-;;;
-
-(defmacro enable-invisible ())
-
-(defmacro end-of-invisible ())
-
-(defun invisible-region (start end)
-  (if (save-excursion
-       (goto-char (1- end))
-       (eq (following-char) ?\n)
-       )
-      (setq end (1- end))
-    )
-  (put-text-property start end 'invisible t)
-  )
-
-(defun visible-region (start end)
-  (put-text-property start end 'invisible nil)
-  )
-
-(defun invisible-p (pos)
-  (get-text-property pos 'invisible)
-  )
-
-(defun next-visible-point (pos)
-  (save-excursion
-    (goto-char (next-single-property-change pos 'invisible))
-    (if (eq (following-char) ?\n)
-       (forward-char)
-      )
-    (point)
-    ))
-
-
-;;; @ mouse
-;;;
-
-(defvar mouse-button-1 [mouse-1])
-(defvar mouse-button-2 [mouse-2])
-(defvar mouse-button-3 [down-mouse-3])
-
-
-;;; @ string
-;;;
-
-(defmacro char-list-to-string (char-list)
-  "Convert list of character CHAR-LIST to string. [emu-19.el]"
-  (` (mapconcat (function char-to-string)
-               (, char-list)
-               "")
-     ))
-
-
-;;; @ end
-;;;
-
-(provide 'emu-19)
-
-;;; emu-19.el ends here

diff --git a/emu-e19.el b/emu-e19.el
new file mode 100644 (file)
index 0000000..a676413
--- /dev/null
+++ b/emu-e19.el
@@ -0,0 +1,106 @@
+;;; emu-e19.el --- emu API implementation for Emacs 19.*
+
+;; Copyright (C) 1995,1996,1997,1998 Free Software Foundation, Inc.
+
+;; Author: MORIOKA Tomohiko <morioka@jaist.ac.jp>
+;; Keywords: emulation, compatibility
+
+;; This file is part of emu.
+
+;; 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.
+
+;;; Code:
+
+;;; @ face
+;;;
+
+(defun-maybe find-face (face)
+  (car (memq face (face-list)))
+  )
+
+
+;;; @ for tm-7.106
+;;;
+
+(defalias 'tl:make-overlay 'make-overlay)
+(defalias 'tl:overlay-put 'overlay-put)
+(defalias 'tl:overlay-buffer 'overlay-buffer)
+
+(make-obsolete 'tl:make-overlay 'make-overlay)
+(make-obsolete 'tl:overlay-put 'overlay-put)
+(make-obsolete 'tl:overlay-buffer 'overlay-buffer)
+
+
+;;; @ visible/invisible
+;;;
+
+(defmacro enable-invisible ())
+
+(defmacro end-of-invisible ())
+
+(defun invisible-region (start end)
+  (if (save-excursion
+       (goto-char (1- end))
+       (eq (following-char) ?\n)
+       )
+      (setq end (1- end))
+    )
+  (put-text-property start end 'invisible t)
+  )
+
+(defun visible-region (start end)
+  (put-text-property start end 'invisible nil)
+  )
+
+(defun invisible-p (pos)
+  (get-text-property pos 'invisible)
+  )
+
+(defun next-visible-point (pos)
+  (save-excursion
+    (goto-char (next-single-property-change pos 'invisible))
+    (if (eq (following-char) ?\n)
+       (forward-char)
+      )
+    (point)
+    ))
+
+
+;;; @ mouse
+;;;
+
+(defvar mouse-button-1 [mouse-1])
+(defvar mouse-button-2 [mouse-2])
+(defvar mouse-button-3 [down-mouse-3])
+
+
+;;; @ string
+;;;
+
+(defmacro char-list-to-string (char-list)
+  "Convert list of character CHAR-LIST to string."
+  (` (mapconcat (function char-to-string)
+               (, char-list)
+               "")
+     ))
+
+
+;;; @ end
+;;;
+
+(provide 'emu-e19)
+
+;;; emu-e19.el ends here

diff --git a/emu-e20.el b/emu-e20.el
index 4fb7e87..bb3f994 100644 (file)
--- a/emu-e20.el
+++ b/emu-e20.el
@@ -28,7 +28,7 @@
 
 ;;; Code:
 
-(require 'emu-19)
+(require 'emu-e19)
 
 (defun fontset-pixel-size (fontset)
   (let* ((info (fontset-info fontset))

diff --git a/emu-latin1.el b/emu-latin1.el
index 69f03e2..105ae35 100644 (file)
--- a/emu-latin1.el
+++ b/emu-latin1.el
@@ -30,7 +30,7 @@
 (cond (running-xemacs
        (require 'emu-xemacs))
       (running-emacs-19
-       (require 'emu-19)
+       (require 'emu-e19)
        ))
 
 

diff --git a/emu-mule.el b/emu-mule.el
index ebcdba4..63987b1 100644 (file)
--- a/emu-mule.el
+++ b/emu-mule.el
@@ -29,7 +29,7 @@
 ;;;
 
 (cond (running-emacs-19
-       (require 'emu-19)
+       (require 'emu-e19)
        
        ;; Suggested by SASAKI Osamu <osamu@shuugr.bekkoame.or.jp>
        ;; (cf. [os2-emacs-ja:78])