From: shuhei <shuhei>
Date: Tue, 25 Jan 2000 12:22:47 +0000 (+0000)
Subject: Synch up to APEL 10.1.
X-Git-Tag: apel-shubit-10_1
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=efcebfdf55bf0e2d25be7f1483a68f4ffc9c3f5a;p=elisp%2Fapel.git

Synch up to APEL 10.1.
---

diff --git a/Makefile b/Makefile
index eee3e10..7a7b9ff 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@
 # Makefile for APEL.
 #
 
-VERSION = 10.0
+VERSION = 10.1
 
 TAR	= tar
 RM	= /bin/rm -f
diff --git a/apel-ver.el b/apel-ver.el
index 54e1e63..b8141ab 100644
--- a/apel-ver.el
+++ b/apel-ver.el
@@ -37,8 +37,8 @@
 
 (product-provide 'apel-ver
   ;; (product-define "APEL" nil '(9 23))	; comment.
-  (product-define "APEL" nil '(10 0))	; Released 24 December 1999
-  ;; (product-define "APEL" nil '(10 1))	;
+  ;; (product-define "APEL" nil '(10 0))	; Released 24 December 1999
+  (product-define "APEL" nil '(10 1))	; Released 20 January 2000
   ;; (product-define "APEL" nil '(10 2))	;
   )
 
diff --git a/poe.el b/poe.el
index b577da1..70d191a 100644
--- a/poe.el
+++ b/poe.el
@@ -89,7 +89,7 @@ Normally the return value is FEATURE."
 	   (if noerror
 	       (condition-case nil
 		   (si:require feature filename)
-		 (error))
+		 (file-error))
 	     (si:require feature filename)))))))
 
 ;; Emacs 19.29 and later: (plist-get PLIST PROP)
@@ -543,6 +543,15 @@ Elements of LIST that are not conses are ignored."
 	     (throw 'found (car list))))
       (setq list (cdr list)))))
 
+;;; Define `functionp' here because "localhook" uses it.
+
+;; Emacs 20.1/XEmacs 20.3 (but first appeared in Epoch?): (functionp OBJECT)
+(defun-maybe functionp (object)
+  "Non-nil if OBJECT is a type of object that can be called as a function."
+  (or (subrp object) (byte-code-function-p object)
+      (eq (car-safe object) 'lambda)
+      (and (symbolp object) (fboundp object))))
+
 ;;; @@ Hook manipulation functions.
 
 ;; "localhook" package is written for Emacs 19.28 and earlier.
@@ -793,13 +802,6 @@ If PATTERN is omitted, it defaults to \"[ \\f\\t\\n\\r\\v]+\"."
       (setq parts (cons (substring string start (match-beginning 0)) parts)
 	    start (match-end 0)))
     (nreverse (cons (substring string start) parts))))
-
-;; Emacs 20.1/XEmacs 20.3 (but first appeared in Epoch?): (functionp OBJECT)
-(defun-maybe functionp (object)
-  "Non-nil if OBJECT is a type of object that can be called as a function."
-  (or (subrp object) (byte-code-function-p object)
-      (eq (car-safe object) 'lambda)
-      (and (symbolp object) (fboundp object))))
 
 
 ;;; @ Window commands emulation. (lisp/window.el)