update.

[elisp/apel.git] / emu.el

diff --git a/emu.el b/emu.el
index 40b70b2..b6c36dc 100644 (file)
--- a/emu.el
+++ b/emu.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 1995,1996,1997,1998 Free Software Foundation, Inc.
 
 ;; Author: MORIOKA Tomohiko <morioka@jaist.ac.jp>
 ;; Copyright (C) 1995,1996,1997,1998 Free Software Foundation, Inc.
 
 ;; Author: MORIOKA Tomohiko <morioka@jaist.ac.jp>

-;; Keywords: emulation, compatibility, NEmacs, MULE, Emacs/mule, XEmacs
+;; Keywords: emulation, compatibility, Nemacs, MULE, Emacs/mule, XEmacs

 
 ;; This file is part of emu.
 
 
 ;; This file is part of emu.
 

@@ -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
 
 ;; 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:
 
 
 ;;; Code:
 

@@ -74,7 +74,7 @@
   (defalias 'tl:overlay-put 'overlay-put)
   (make-obsolete 'tl:overlay-put 'overlay-put)
   )
   (defalias 'tl:overlay-put 'overlay-put)
   (make-obsolete 'tl:overlay-put 'overlay-put)
   )

-(unless (fboundp 'tl:overlay-put)
+(unless (fboundp 'tl:overlay-buffer)

   (defalias 'tl:overlay-buffer 'overlay-buffer)
   (make-obsolete 'tl:overlay-buffer 'overlay-buffer)
   )
   (defalias 'tl:overlay-buffer 'overlay-buffer)
   (make-obsolete 'tl:overlay-buffer 'overlay-buffer)
   )

@@ -98,7 +98,12 @@
 CHAR can be any multilingual character
 TABLE defaults to the current buffer's category table."
                (mapconcat (lambda (chr)
 CHAR can be any multilingual character
 TABLE defaults to the current buffer's category table."
                (mapconcat (lambda (chr)

-                            (char-to-string (int-char chr)))
+                            (if (integerp chr)
+                                (char-to-string (int-char chr))
+                              (char-to-string chr)))
+                          ;; `char-category-list' returns a list of
+                          ;; characters in XEmacs 21.2.25 and later,
+                          ;; otherwise integers.

                           (char-category-list character)
                           ""))
              )
                           (char-category-list character)
                           ""))
              )

@@ -118,7 +123,7 @@ TABLE defaults to the current buffer's category table."
              ))
        )
       ((boundp 'NEMACS)
              ))
        )
       ((boundp 'NEMACS)

-       ;; for NEmacs and NEpoch
+       ;; for Nemacs and Nepoch

 
        ;; old MULE emulation
        (defconst *noconv*    0)
 
        ;; old MULE emulation
        (defconst *noconv*    0)