X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=poem.el;h=70ef7be0c03603b340e31339b9719ed2a54fa3b6;hb=4426be092c80a2e8c8113ccb1e696743d6210263;hp=ec87a433dc591bda26aa138a384c1fa6392aa3d2;hpb=6f525962ef7a53053d381e49f82a5a37bf3baed6;p=elisp%2Fapel.git

diff --git a/poem.el b/poem.el
index ec87a43..70ef7be 100644
--- a/poem.el
+++ b/poem.el
@@ -19,8 +19,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Code:
 
@@ -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 'characterp
+  (cond
+   ((fboundp 'char-valid-p) 'char-valid-p)
+   (t 'integerp)))
 
-(defalias-maybe 'char-or-char-int-p '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.