X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=emu-xemacs.el;h=7815219b78abdcbef67e90135929a31b608618de;hb=ef7e644c5f95a416569e21720c4e64a2a30c31aa;hp=0549710d3c9be442f06de877f49c8303812b77d8;hpb=ffeba3c986971ce58ec384999c4dd88bf091887b;p=elisp%2Fapel.git

diff --git a/emu-xemacs.el b/emu-xemacs.el
index 0549710..7815219 100644
--- a/emu-xemacs.el
+++ b/emu-xemacs.el
@@ -5,7 +5,7 @@
 
 ;; Author: MORIOKA Tomohiko <morioka@jaist.ac.jp>
 ;; Version:
-;;	$Id: emu-xemacs.el,v 7.17 1997/03/06 17:46:39 morioka Exp $
+;;	$Id: emu-xemacs.el,v 7.19 1997/04/05 06:50:48 morioka Exp $
 ;; Keywords: emulation, compatibility, XEmacs
 
 ;; This file is part of XEmacs.
@@ -46,16 +46,18 @@
 ;;; @ overlay
 ;;;
 
-(defalias 'tl:make-overlay 'make-extent)
-(defalias 'tl:overlay-put 'set-extent-property)
-(defalias 'tl:overlay-buffer 'extent-buffer)
-
-(defun tl:move-overlay (extent start end &optional buffer)
-  (set-extent-endpoints extent start end)
-  )
+(condition-case nil
+    (require 'overlay)
+  (error (defalias 'make-overlay 'make-extent)
+	 (defalias 'overlay-put 'set-extent-property)
+	 (defalias 'overlay-buffer 'extent-buffer)
+	 (defun move-overlay (extent start end &optional buffer)
+	   (set-extent-endpoints extent start end)
+	   )
+	 ))
 
 
-;;; @@ visible/invisible
+;;; @ visible/invisible
 ;;;
 
 (defmacro enable-invisible ())
@@ -65,8 +67,7 @@
 (defun invisible-region (start end)
   (if (save-excursion
 	(goto-char start)
-	(eq (following-char) ?\n)
-	)
+	(eq (following-char) ?\n))
       (setq start (1+ start))
     )
   (put-text-property start end 'invisible t)
@@ -79,8 +80,7 @@
 (defun invisible-p (pos)
   (if (save-excursion
 	(goto-char pos)
-	(eq (following-char) ?\n)
-	)
+	(eq (following-char) ?\n))
       (setq pos (1+ pos))
     )
   (get-text-property pos 'invisible)
@@ -90,13 +90,11 @@
   (save-excursion
     (if (save-excursion
 	  (goto-char pos)
-	  (eq (following-char) ?\n)
-	  )
+	  (eq (following-char) ?\n))
 	(setq pos (1+ pos))
       )
     (or (next-single-property-change pos 'invisible)
-	(point-max))
-    ))
+	(point-max))))
 
 
 ;;; @ mouse
@@ -114,8 +112,7 @@
     (defun dired-other-frame (dirname &optional switches)
       "\"Edit\" directory DIRNAME.  Like `dired' but makes a new frame."
       (interactive (dired-read-dir-and-switches "in other frame "))
-      (switch-to-buffer-other-frame (dired-noselect dirname switches))
-      )
+      (switch-to-buffer-other-frame (dired-noselect dirname switches)))
     )
 
 
@@ -145,8 +142,7 @@
 				  filename))
 	  (setq directory (file-name-directory (substring directory 0 -1))
 		ancestor (concat "../" ancestor)))
-	(concat ancestor (substring filename (match-end 0)))
-	))
+	(concat ancestor (substring filename (match-end 0)))))
     )