From: yoichi <yoichi>
Date: Sun, 8 May 2005 14:46:06 +0000 (+0000)
Subject: 2005-05-03  Tatsuya Kinoshita  <tats@vega.ocn.ne.jp>
X-Git-Tag: apel-10_7~21
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=3efd07b04c83c4c3de1db58caabec2d9cd8de270;p=elisp%2Fapel.git

2005-05-03  Tatsuya Kinoshita  <tats@vega.ocn.ne.jp>

	* poem.el (characterp): Use `char-valid-p' if it exists.
	* poem.el (char-or-char-int-p): Ditto.
---

diff --git a/ChangeLog b/ChangeLog
index a2ba643..23f0a84 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-05-03  Tatsuya Kinoshita  <tats@vega.ocn.ne.jp>
+
+	* poem.el (characterp): Use `char-valid-p' if it exists.
+	* poem.el (char-or-char-int-p): Ditto.
+
 2005-02-23  Katsumi Yamaoka  <yamaoka@jpl.org>
 
 	* poe-xemacs.el (run-at-time): Attempt to load `timer-funcs'
diff --git a/poem.el b/poem.el
index ec87a43..59d26df 100644
--- a/poem.el
+++ b/poem.el
@@ -77,9 +77,15 @@ If POS is out of range, the value is nil.
 
 (defalias-maybe 'int-char 'identity)
 
-(defalias-maybe 'characterp 'integerp)
-
-(defalias-maybe 'char-or-char-int-p 'integerp)
+(defalias-maybe 'characterp
+  (cond
+   ((fboundp 'char-valid-p) 'char-valid-p)
+   (t 'integerp)))
+
+(defalias-maybe 'char-or-char-int-p
+  (cond
+   ((fboundp 'char-valid-p) 'char-valid-p)
+   (t 'integerp)))
 
 (defun-maybe char-octet (ch &optional n)
   "Return the octet numbered N (should be 0 or 1) of char CH.