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

diff --git a/poem.el b/poem.el
index 9653c82..70ef7be 100644
--- a/poem.el
+++ b/poem.el
@@ -1,6 +1,6 @@
 ;;; poem.el --- Emulate latest MULE features; -*-byte-compile-dynamic: t;-*-
 
-;; Copyright (C) 1998 Free Software Foundation, Inc.
+;; Copyright (C) 1998,1999 Free Software Foundation, Inc.
 
 ;; Author: MORIOKA Tomohiko <morioka@jaist.ac.jp>
 ;; Keywords: emulation, compatibility, Mule
@@ -19,16 +19,12 @@
 
 ;; 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:
 
-(require 'poe)
-
-(eval-and-compile
-  (unless (fboundp 'open-network-stream)
-    (require 'tcp)))
+(require 'pces)
 
 (cond ((featurep 'mule)
        (cond ((featurep 'xemacs)
@@ -68,7 +64,7 @@ If STRING is multibyte, the result is STRING itself.
 
 (defun-maybe charset-after (&optional pos)
   "Return charset of a character in current buffer at position POS.
-If POS is nil, it defauls to the current point.
+If POS is nil, it defaults to the current point.
 If POS is out of range, the value is nil.
 \[Emacs 20.3 emulating function]"
   (char-charset (char-after pos))
@@ -81,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.
@@ -98,6 +100,7 @@ N defaults to 0 if omitted. [XEmacs-mule emulating function]"
 ;;; @ end
 ;;;
 
-(provide 'poem)
+(require 'product)
+(product-provide (provide 'poem) (require 'apel-ver))
 
 ;;; poem.el ends here