(insert-file-contents-as-binary): Return value.

[elisp/apel.git] / EMU-ELS

diff --git a/EMU-ELS b/EMU-ELS
index ea99b9a..17d9275 100644 (file)
--- a/EMU-ELS
+++ b/EMU-ELS
@@ -1,7 +1,8 @@
 ;;; -*-Emacs-Lisp-*-
-;;;
-;;; $Id: EMU-ELS,v 1.5 1998-04-16 23:07:34 morioka Exp $
-;;;
+
+;; EMU-ELS: list of EMU modules to install
+
+;;; Code:
 
 (setq emu-modules
       (cons
@@ -19,11 +20,17 @@
              (cons 'emu-xemacs
                    (if (featurep 'mule)
                        '(emu-20 emu-x20) ; for XEmacs with MULE
-                     '(emu-latin1))) ; for XEmacs without MULE
+                     '(emu-latin1) ; for XEmacs without MULE
+                     ))
              )
-            ((featurep 'mule)
+            (running-mule-merged-emacs
              ;; for Emacs 20.1 or later
-             '(emu-20 emu-e19 emu-e20)
+             (cons (if (and (fboundp 'set-buffer-multibyte)
+                            (subrp (symbol-function 'set-buffer-multibyte)))
+                       'emu-e20_3 ; for Emacs 20.3
+                     'emu-e20_2 ; for Emacs 20.1 and 20.2
+                     )
+                   '(emu-20 emu-e19 emu-e20))
              )
             ((boundp 'MULE)
              ;; for MULE 1.* and MULE 2.*