Merge apel-shubit.

[elisp/apel.git] / poe-xemacs.el

diff --git a/poe-xemacs.el b/poe-xemacs.el
index cfa7761..0ab7128 100644 (file)
--- a/poe-xemacs.el
+++ b/poe-xemacs.el
@@ -1,4 +1,4 @@
-;;; poe-xemacs.el --- poe submodule for XEmacs -*-byte-compile-dynamic: t;-*-
+;;; poe-xemacs.el --- poe submodule for XEmacs
 
 ;; Copyright (C) 1995 Free Software Foundation, Inc.
 ;; Copyright (C) 1995,1996,1997,1998 MORIOKA Tomohiko
@@ -25,12 +25,11 @@
 
 ;;; Code:
 
-;;; @ color
-;;;
+(require 'pym)
 
 
-(eval-when-compile
-  (require 'poe))
+;;; @ color
+;;;
 
 (defun-maybe set-cursor-color (color-name)
   "Set the text cursor color of the selected frame to COLOR.
@@ -60,15 +59,14 @@ When called interactively, prompt for the name of the color to use."
 
 (condition-case nil
     (require 'overlay)
-  (error (defalias 'make-overlay 'make-extent)
-        (defalias 'overlayp 'extentp)
-        (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)
-          )
-        (defalias 'delete-overlay 'detach-extent)
-        ))
+  (error
+   (defalias 'make-overlay 'make-extent)
+   (defalias 'overlayp 'extentp)
+   (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))
+   (defalias 'delete-overlay 'detach-extent)))
 
 
 ;;; @ dired
@@ -77,8 +75,7 @@ When called interactively, prompt for the name of the color to use."
 (defun-maybe 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)))
 
 
 ;;; @ to avoid bug of XEmacs 19.14
@@ -89,7 +86,7 @@ When called interactively, prompt for the name of the color to use."
     ;; This function was imported from Emacs 19.33.
     (defun file-relative-name (filename &optional directory)
       "Convert FILENAME to be relative to DIRECTORY
-(default: default-directory). [poe-xemacs.el]"
+(default: default-directory)."
       (setq filename (expand-file-name filename)
            directory (file-name-as-directory
                       (expand-file-name
@@ -99,49 +96,13 @@ When called interactively, prompt for the name of the color to use."
                                  filename))
          (setq directory (file-name-directory (substring directory 0 -1))
                ancestor (concat "../" ancestor)))
-       (concat ancestor (substring filename (match-end 0)))))
-    )
-
-
-;;; @ for anything older than XEmacs 20.2
-;;;
-
-;; eval-after-load is not defined in XEmacs but after-load-alist is
-;; usable.  See subr.el in XEmacs.
-
-(defun-maybe eval-after-load (file form)
-  "Arrange that, if FILE is ever loaded, FORM will be run at that time.
-This makes or adds to an entry on `after-load-alist'.
-If FILE is already loaded, evaluate FORM right now.
-It does nothing if FORM is already on the list for FILE.
-FILE should be the name of a library, with no directory name."
-  ;; Make sure there is an element for FILE.
-  (or (assoc file after-load-alist)
-      (setq after-load-alist (cons (list file) after-load-alist)))
-  ;; Add FORM to the element if it isn't there.
-  (let ((elt (assoc file after-load-alist)))
-    (or (member form (cdr elt))
-       (progn
-         (nconc elt (list form))
-         ;; If the file has been loaded already, run FORM right away.
-         (and (assoc file load-history)
-              (eval form)))))
-  form)
-
-;; (defun-maybe eval-after-load (file form)
-;;   (or (assoc file after-load-alist)
-;;       (setq after-load-alist (cons (list file) after-load-alist)))
-;;   (let ((elt (assoc file after-load-alist)))
-;;     (or (member form (cdr elt))
-;;         (nconc elt (list form))))
-;;   form)
+       (concat ancestor (substring filename (match-end 0))))))
 
 
 ;;; @ Emacs 20.3 emulation
 ;;;
 
 (defalias-maybe 'line-beginning-position 'point-at-bol)
-
 (defalias-maybe 'line-end-position 'point-at-eol)