Modify comments.

diff --git a/emu-e19.el b/emu-e19.el
index 8ade763..d4b9360 100644 (file)
--- a/emu-e19.el
+++ b/emu-e19.el
@@ -288,8 +288,9 @@ Optional non-nil arg START-COLUMN specifies the starting column.
   (substring str start-column width)
   )
 
-;;; @@ for old MULE emulation
+;;; @@ obsoleted aliases
 ;;;
+;;; You should not use them.
 
 (defalias 'string-columns 'length)
 (make-obsolete 'string-columns 'string-width)

diff --git a/emu-e20.el b/emu-e20.el
index e5a8f7a..4fb7e87 100644 (file)
--- a/emu-e20.el
+++ b/emu-e20.el
@@ -174,6 +174,8 @@ code conversion will not take place."
 ;;; @ character
 ;;;
 
+(defalias 'char-length 'char-bytes)
+
 (defmacro char-next-index (char index)
   "Return index of character succeeding CHAR whose index is INDEX."
   `(+ index (char-bytes char)))
@@ -189,13 +191,6 @@ TABLE defaults to the current buffer's category table."
   (category-set-mnemonics (char-category-set character))
   )
 
-;;; @@ obsoleted aliases
-;;;
-;;; You should not use them.
-
-(defalias 'char-length 'char-bytes)
-;;(defalias 'char-columns 'char-width)
-
 
 ;;; @ string
 ;;;

diff --git a/emu-nemacs.el b/emu-nemacs.el
index 52cfab8..77bfc0a 100644 (file)
--- a/emu-nemacs.el
+++ b/emu-nemacs.el
@@ -356,7 +356,7 @@ find-file-hooks, etc.
 ;;; @ string
 ;;;
 
-(defalias 'string-columns 'length)
+(defalias 'string-width 'length)
 
 (defun sref (str idx)
   "Return the character in STR at index IDX.
@@ -414,10 +414,11 @@ Optional non-nil arg START-COLUMN specifies the starting column.
            (setq to to-prev)))
       (substring str from to))))
 
-;;; @@ for Mule emulation
+;;; @@ obsoleted aliases
 ;;;
+;;; You should not use them.
 
-(defalias 'string-width 'length)
+(defalias 'string-columns 'length)
 
 
 ;;; @ text property emulation