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

diff --git a/EMU-ELS b/EMU-ELS
index 1e4484f..6048b8c 100644 (file)
--- a/EMU-ELS
+++ b/EMU-ELS
@@ -36,7 +36,7 @@
              )
             ((boundp 'NEMACS)
              ;; for NEmacs
-             '(poe-18 poem-nemacs mcs-nemacs emu-nemacs)
+             '(poe-18 poem-nemacs mcs-nemacs)
              )
             (t
              ;; for Emacs 19.34

diff --git a/emu-nemacs.el b/emu-nemacs.el
deleted file mode 100644 (file)
index b1a622c..0000000
--- a/emu-nemacs.el
+++ /dev/null
@@ -1,68 +0,0 @@
-;;; emu-nemacs.el --- emu API implementation for NEmacs
-
-;; Copyright (C) 1995,1996,1997,1998 MORIOKA Tomohiko
-
-;; Author: MORIOKA Tomohiko <morioka@jaist.ac.jp>
-;; Keywords: emulation, compatibility, NEmacs, mule
-
-;; 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
-;;;
-
-;;; @@ for old MULE emulation
-;;;
-
-(defconst *noconv*    0)
-(defconst *sjis*      1)
-(defconst *junet*     2)
-(defconst *ctext*     2)
-(defconst *internal*  3)
-(defconst *euc-japan* 3)
-
-(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-nemacs.el; Mule emulating function]"
-  (if (not (eq ic oc))
-      (convert-string-kanji-code str ic oc)
-    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-nemacs.el; Mule emulating function]"
-  (if (/= ic oc)
-      (save-excursion
-       (save-restriction
-         (narrow-to-region beg end)
-         (convert-region-kanji-code beg end ic oc)))
-    ))
-
-
-;;; @ end
-;;;
-
-(provide 'emu-nemacs)
-
-;;; emu-nemacs.el ends here

diff --git a/emu.el b/emu.el
index 0af9f1a..94051e0 100644 (file)
--- a/emu.el
+++ b/emu.el
@@ -95,7 +95,33 @@
        )
       ((boundp 'NEMACS)
        ;; for NEmacs and NEpoch
-       (require 'emu-nemacs)
+
+       ;; old MULE emulation
+       (defconst *noconv*    0)
+       (defconst *sjis*      1)
+       (defconst *junet*     2)
+       (defconst *ctext*     2)
+       (defconst *internal*  3)
+       (defconst *euc-japan* 3)
+       
+       (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-nemacs.el; Mule emulating function]"
+        (if (not (eq ic oc))
+            (convert-string-kanji-code str ic oc)
+          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-nemacs.el; Mule emulating function]"
+        (if (/= ic oc)
+            (save-excursion
+              (save-restriction
+                (narrow-to-region beg end)
+                (convert-region-kanji-code beg end ic oc)))
+          ))
        )
       (t
        ;; for Emacs 19 and XEmacs without MULE