Move definitions of emu-latin1.el to emu.el; abolish emu-latin1.el.

diff --git a/EMU-ELS b/EMU-ELS
index 6048b8c..714390f 100644 (file)
--- a/EMU-ELS
+++ b/EMU-ELS
@@ -15,7 +15,7 @@
                        ;; for XEmacs with MULE
                        '(poem-20 poem-xm mcs-20 mcs-xm emu-20 emu-x20)
                      ;; for XEmacs without MULE
-                     '(poem-ltn1 mcs-ltn1 emu-latin1)
+                     '(poem-ltn1 mcs-ltn1)
                      ))
              )
             (running-mule-merged-emacs
@@ -40,7 +40,7 @@
              )
             (t
              ;; for Emacs 19.34
-             '(poe-19 poem-ltn1 mcs-ltn1 emu-latin1)
+             '(poe-19 poem-ltn1 mcs-ltn1)
              ))
        emu-modules))
 

diff --git a/emu-latin1.el b/emu-latin1.el
deleted file mode 100644 (file)
index a8b7ddc..0000000
--- a/emu-latin1.el
+++ /dev/null
@@ -1,58 +0,0 @@
-;;; emu-latin1.el --- emu module for Emacs 19 and XEmacs without MULE
-
-;; Copyright (C) 1995,1996,1997,1998 Free Software Foundation, Inc.
-
-;; Author: MORIOKA Tomohiko <morioka@jaist.ac.jp>
-;; Keywords: emulation, compatibility, mule, Latin-1
-
-;; 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:
-
-(require 'poem)
-
-
-;;; @ coding-system
-;;;
-
-(defconst *internal* nil)
-(defconst *ctext* nil)
-(defconst *noconv* nil)
-
-;;; @@ for old MULE emulation
-;;;
-
-(defun code-convert-string (str ic oc)
-  "Convert code in STRING from SOURCE code to TARGET code,
-On successful converion, returns the result string,
-else returns nil. [emu-latin1.el; old MULE emulating function]"
-  str)
-
-(defun code-convert-region (beg end ic oc)
-  "Convert code of the text between BEGIN and END from SOURCE
-to TARGET. On successful conversion returns t,
-else returns nil. [emu-latin1.el; old MULE emulating function]"
-  t)
-
-
-;;; @ end
-;;;
-
-(provide 'emu-latin1)
-
-;;; emu-latin1.el ends here

diff --git a/emu.el b/emu.el
index 94051e0..cd62652 100644 (file)
--- a/emu.el
+++ b/emu.el
@@ -125,7 +125,23 @@ else returns nil. [emu-nemacs.el; Mule emulating function]"
        )
       (t
        ;; for Emacs 19 and XEmacs without MULE
-       (require 'emu-latin1)
+       
+       ;; old MULE emulation
+       (defconst *internal* nil)
+       (defconst *ctext* nil)
+       (defconst *noconv* nil)
+       
+       (defun code-convert-string (str ic oc)
+        "Convert code in STRING from SOURCE code to TARGET code,
+On successful converion, returns the result string,
+else returns nil. [emu-latin1.el; old MULE emulating function]"
+        str)
+
+       (defun code-convert-region (beg end ic oc)
+        "Convert code of the text between BEGIN and END from SOURCE
+to TARGET. On successful conversion returns t,
+else returns nil. [emu-latin1.el; old MULE emulating function]"
+        t)
        ))