X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=emu-nemacs.el;h=91ee9d579f542be023ad461a7801b6a913614046;hb=a1c269720af0e9168d3f34fe6cc024a9583665c7;hp=68e383858396fbc6fb34f2d9152b7200bd662ceb;hpb=2f52cc139943b08303f233ff49a691b243c26451;p=elisp%2Fapel.git

diff --git a/emu-nemacs.el b/emu-nemacs.el
index 68e3838..91ee9d5 100644
--- a/emu-nemacs.el
+++ b/emu-nemacs.el
@@ -335,28 +335,17 @@ find-file-hooks, etc.
       1
     2))
 
+(defalias 'char-length 'char-bytes)
+
 (defmacro char-next-index (char index)
   "Return index of character succeeding CHAR whose index is INDEX."
   (` (1+ index)))
 
-;;; @@ Old Mule emulating aliases
-;;;
-;;; You should not use them.
-
-(defalias 'char-leading-char 'char-charset)
-
-;;; @@ obsoleted aliases
-;;;
-;;; You should not use them.
-
-(defalias 'char-length 'char-bytes)
-(defalias 'char-columns 'char-width)
-
 
 ;;; @ string
 ;;;
 
-(defalias 'string-columns 'length)
+(defalias 'string-width 'length)
 
 (defun sref (str idx)
   "Return the character in STR at index IDX.
@@ -414,10 +403,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