From 6c94f3a2f509ad09c2b2ea9760c076a3c9f07bf1 Mon Sep 17 00:00:00 2001
From: morioka <morioka>
Date: Mon, 9 Mar 1998 07:31:46 +0000
Subject: [PATCH] tm 6.79.

---
 Makefile      |   63 +++++++++------------------------------------------------
 emu-xemacs.el |   38 ++++++++++++++++++++++++++++++++++
 emu.el        |    6 +++++-
 3 files changed, 53 insertions(+), 54 deletions(-)
 create mode 100644 emu-xemacs.el

diff --git a/Makefile b/Makefile
index ead46b4..27fda11 100644
--- a/Makefile
+++ b/Makefile
@@ -1,17 +1,8 @@
 #
-# $Id: Makefile,v 6.0 1995/08/26 20:17:00 morioka Exp morioka $
+# $Id: Makefile,v 6.1 1995/09/08 17:51:11 morioka Exp morioka $
 #
 
-# Please specify emacs executables:
-#	NEMACS	= for NEMACS (or NEpoch)
-#	MULE1	= for Mule 1.* (based on Emacs 18.*)
-#	ORIG19	= for Emacs 19.* (FSF original or XEmacs)
-#	MULE2	= for MULE 2.* (based on Emacs 19.*)
-
-NEMACS	= nemacs
-MULE1	= mule1
-ORIG19	= emacs19
-MULE2	= mule2
+EMACS	= mule
 
 
 # Please specfy Emacs Lisp install directory:
@@ -24,54 +15,20 @@ MULE2	= mule2
 TLDIR18 = $(HOME)/lib/emacs18/lisp
 TLDIR19 = $(HOME)/lib/emacs19/lisp
 
-FILES	= tl/README.eng tl/Makefile tl/Makefile.bc tl/loadpath \
-	tl/*.el tl/doc/*.texi
-
-TARFILE = tl-6.6.1.tar
-
-
-nemacs:
-	make -f Makefile.bc all \
-		EMACS=$(NEMACS) EMACS_TYPE=nemacs \
-		EMU18=emu-18.el OPT='-l emu-18.el'
-
-install-nemacs:	nemacs
-	make -f Makefile.bc install \
-		EMACS=$(NEMACS) EMACS_TYPE=nemacs \
-		EMU18=emu-18.el OPT='-l emu-18.el' \
-		TLDIR=$(TLDIR18)
-
-
-mule1:
-	make -f Makefile.bc all \
-		EMACS=$(MULE1) EMACS_TYPE=mule \
-		EMU18=emu-18.el OPT='-l emu-18.el'
-
-install-mule1:	mule1
-	make -f Makefile.bc install \
-		EMACS=$(MULE1) EMACS_TYPE=mule \
-		EMU18=emu-18.el OPT='-l emu-18.el' \
-		TLDIR=$(TLDIR18)
 
+FILES	= tl/README.eng tl/Makefile tl/mk-tl tl/*.el tl/doc/*.texi
 
-orig19:
-	make -f Makefile.bc all \
-		EMACS=$(ORIG19) EMACS_TYPE=orig
+TARFILE = tl-6.6.2.tar
 
-install-orig19:	orig19
-	make -f Makefile.bc install \
-		EMACS=$(ORIG19) EMACS_TYPE=orig \
-		TLDIR=$(TLDIR19)
 
+elc:
+	$(EMACS) -batch -l mk-tl -f compile-tl
 
-mule2:
-	make -f Makefile.bc all \
-		EMACS=$(MULE2) EMACS_TYPE=mule
+install-18:
+	$(EMACS) -batch -l mk-tl -f install-tl $(TLDIR18)
 
-install-mule2:	mule2
-	make -f Makefile.bc install \
-		EMACS=$(MULE2) EMACS_TYPE=mule \
-		TLDIR=$(TLDIR19)
+install-19:
+	$(EMACS) -batch -l mk-tl -f install-tl $(TLDIR19)
 
 
 clean:
diff --git a/emu-xemacs.el b/emu-xemacs.el
new file mode 100644
index 0000000..7be0fc7
--- /dev/null
+++ b/emu-xemacs.el
@@ -0,0 +1,38 @@
+;;;
+;;; emu-xemacs: Emacs 19 emulation module for XEmacs
+;;;
+;;; $Id: emu-xemacs.el,v 2.0 1995/09/08 17:47:54 morioka Exp $
+;;;
+
+(or (fboundp 'face-list)
+    (defalias 'face-list 'list-faces)
+    )
+
+(or (memq 'underline (face-list))
+    (and (fboundp 'make-face)
+	 (make-face 'underline)
+	 ))
+
+(or (face-differs-from-default-p 'underline)
+    (set-face-underline-p 'underline t))
+
+(or (fboundp 'set-text-properties)
+    (defun set-text-properties (start end props &optional buffer)
+      (if (or (null buffer) (bufferp buffer))
+	  (if props
+	      (while props
+		(put-text-property 
+		 start end (car props) (nth 1 props) buffer)
+		(setq props (nthcdr 2 props)))
+	    (remove-text-properties start end ())
+	    )))
+    )
+
+(defalias 'make-overlay 'make-extent)
+(defalias 'overlay-put 'set-extent-property)
+
+(defun move-overlay (extent start end &optional buffer)
+  (set-extent-endpoints extent start end)
+  )
+
+(provide 'emu-xemacs)
diff --git a/emu.el b/emu.el
index e0c1c11..55e8d4d 100644
--- a/emu.el
+++ b/emu.el
@@ -1,7 +1,7 @@
 ;;;
 ;;; emu: Emulation module for each Emacs variants
 ;;;
-;;; $Id: emu.el,v 1.1 1995/08/26 18:22:56 morioka Exp $
+;;; $Id: emu.el,v 2.0 1995/09/08 17:47:33 morioka Exp $
 ;;;
 
 (cond ((boundp 'MULE)  (require 'emu-mule))
@@ -9,6 +9,10 @@
       (t               (require 'emu-orig))
       )
 
+(if (string-match "XEmacs\\|Lucid" emacs-version)
+    (require 'emu-xemacs)
+  )
+
 
 ;;; @ Emacs 19.29 emulation
 ;;;
-- 
1.7.10.4