Move `string-as-unibyte', `string-as-multibyte', `char-int',

`int-char' and `char-or-char-int-p' from emu.el to poem.el.

diff --git a/emu.el b/emu.el
index 8994e49..7ab6efb 100644 (file)
--- a/emu.el
+++ b/emu.el
@@ -133,36 +133,6 @@ find-file-hooks, etc.
    (insert-file-contents-literally filename visit beg end replace)))
 
 
-;;; @ Emacs 20.3 emulation
-;;;
-
-(defmacro-maybe string-as-unibyte (string)
-  "Return a unibyte string with the same individual bytes as STRING.
-If STRING is unibyte, the result is STRING itself.
-\[Emacs 20.3 emulating macro]"
-  string)
-
-(defmacro-maybe string-as-multibyte (string)
-  "Return a multibyte string with the same individual bytes as STRING.
-If STRING is multibyte, the result is STRING itself.
-\[Emacs 20.3 emulating macro]"
-  string)
-
-
-;;; @ for XEmacs 20
-;;;
-
-(or (fboundp 'char-int)
-    (fset 'char-int (symbol-function 'identity))
-    )
-(or (fboundp 'int-char)
-    (fset 'int-char (symbol-function 'identity))
-    )
-(or (fboundp 'char-or-char-int-p)
-    (fset 'char-or-char-int-p (symbol-function 'integerp))
-    )
-
-
 ;;; @ for text/richtext and text/enriched
 ;;;
 

diff --git a/poem.el b/poem.el
index 12a6fdd..13d219f 100644 (file)
--- a/poem.el
+++ b/poem.el
@@ -47,6 +47,35 @@
        ))
 
 
+;;; @ Emacs 20.3 emulation
+;;;
+
+(defmacro-maybe string-as-unibyte (string)
+  "Return a unibyte string with the same individual bytes as STRING.
+If STRING is unibyte, the result is STRING itself.
+\[Emacs 20.3 emulating macro]"
+  string)
+
+(defmacro-maybe string-as-multibyte (string)
+  "Return a multibyte string with the same individual bytes as STRING.
+If STRING is multibyte, the result is STRING itself.
+\[Emacs 20.3 emulating macro]"
+  string)
+
+
+;;; @ XEmacs 20 emulation
+;;;
+
+(or (fboundp 'char-int)
+    (fset 'char-int (symbol-function 'identity)))
+
+(or (fboundp 'int-char)
+    (fset 'int-char (symbol-function 'identity)))
+
+(or (fboundp 'char-or-char-int-p)
+    (fset 'char-or-char-int-p (symbol-function 'integerp)))
+
+
 ;;; @ end
 ;;;