(insert-file-contents-as-raw-text): New function.

[elisp/apel.git] / emu.el

diff --git a/emu.el b/emu.el
index 2493330..bf1df70 100644 (file)
--- a/emu.el
+++ b/emu.el
@@ -1,9 +1,8 @@
 ;;; emu.el --- Emulation module for each Emacs variants
 
-;; Copyright (C) 1995,1996,1997 Free Software Foundation, Inc.
+;; Copyright (C) 1995,1996,1997,1998 Free Software Foundation, Inc.
 
 ;; Author: MORIOKA Tomohiko <morioka@jaist.ac.jp>
-;; Version: $Id: emu.el,v 7.48 1997/09/07 02:37:40 morioka Exp $
 ;; Keywords: emulation, compatibility, NEmacs, MULE, Emacs/mule, XEmacs
 
 ;; This file is part of emu.
@@ -101,14 +100,23 @@
   (or (and running-xemacs-19 (>= emacs-minor-version 14))
       running-xemacs-20-or-later))
 
-(cond (running-mule-merged-emacs
+(cond (running-xemacs
+       ;; for XEmacs
+       (require 'emu-xemacs)
+       (cond ((featurep 'mule)
+             ;; for XEmacs with MULE
+             (require 'emu-20)
+             (require 'emu-x20)
+             )
+            (t
+             ;; for XEmacs without MULE
+             (require 'emu-latin1)
+             ))
+       )
+      (running-mule-merged-emacs
        ;; for Emacs 20.1 and 20.2
        (require 'emu-e20)
        )
-      (running-xemacs-with-mule
-       ;; for XEmacs with mule
-       (require 'emu-x20)
-       )
       ((boundp 'MULE)
        ;; for MULE 1.* and 2.*
        (require 'emu-mule)
@@ -118,7 +126,8 @@
        (require 'emu-nemacs)
        )
       (t
-       ;; for Emacs 19 and XEmacs without mule
+       ;; for Emacs 19
+       (require 'emu-e19)
        (require 'emu-latin1)
        ))
 
@@ -265,6 +274,22 @@ Value is nil if OBJECT is not a buffer or if it has been killed.
              (list 'select-window 'save-selected-window-window))))
 
 
+;;; @ Emacs 20.3 emulation
+;;;
+
+(defmacro-maybe string-as-unibyte (string)
+  "Return a unibyte string with the same individual bytes as STRING.
+If STRING is unibyte, the result is STRING itself.
+\[Emacs 20.3 emulating macro]"
+  string)
+
+(defmacro-maybe string-as-multibyte (string)
+  "Return a multibyte string with the same individual bytes as STRING.
+If STRING is multibyte, the result is STRING itself.
+\[Emacs 20.3 emulating macro]"
+  string)
+
+
 ;;; @ XEmacs emulation
 ;;;