(char-next-index): Fixed.

diff --git a/emu-e20_2.el b/emu-e20_2.el
index 65bd360..d713712 100644 (file)
--- a/emu-e20_2.el
+++ b/emu-e20_2.el
@@ -45,7 +45,7 @@ but the contents viewed as characters do change."
 
 (defmacro char-next-index (char index)
   "Return index of character succeeding CHAR whose index is INDEX."
-  `(+ index (char-bytes char)))
+  `(+ ,index (char-bytes char)))
 
 
 ;;; @ string

diff --git a/emu-e20_3.el b/emu-e20_3.el
index 3d658f3..6362a0f 100644 (file)
--- a/emu-e20_3.el
+++ b/emu-e20_3.el
@@ -37,7 +37,7 @@
 
 (defmacro char-next-index (char index)
   "Return index of character succeeding CHAR whose index is INDEX."
-  `(1+ index))
+  `(1+ ,index))
 
 
 ;;; @ string

diff --git a/emu-latin1.el b/emu-latin1.el
index 99034a2..3091507 100644 (file)
--- a/emu-latin1.el
+++ b/emu-latin1.el
@@ -245,7 +245,7 @@ find-file-hooks, etc.
 
 (defmacro char-next-index (char index)
   "Return index of character succeeding CHAR whose index is INDEX."
-  (` (1+ index)))
+  (` (1+ (, index))))
 
 
 ;;; @ string

diff --git a/emu-mule.el b/emu-mule.el
index 63987b1..63be74e 100644 (file)
--- a/emu-mule.el
+++ b/emu-mule.el
@@ -319,7 +319,7 @@ It must be symbol.")
 
 (defmacro char-next-index (char index)
   "Return index of character succeeding CHAR whose index is INDEX."
-  (` (+ index (char-bytes char))))
+  (` (+ (, index) (char-bytes (, char)))))
 
 ;;; @@ obsoleted aliases
 ;;;

diff --git a/emu-x20.el b/emu-x20.el
index 8790697..42930a0 100644 (file)
--- a/emu-x20.el
+++ b/emu-x20.el
@@ -146,7 +146,7 @@ find-file-hooks, etc.
 
 (defmacro char-next-index (char index)
   "Return index of character succeeding CHAR whose index is INDEX."
-  `(1+ index))
+  `(1+ ,index))
 
 ;;; @@ Mule emulating aliases
 ;;;