(charset-chars): Add optional dimension arg.

(unify-8859-on-encoding-mode, unify-8859-on-decoding-mode): Moved
to mule-cmds.el.

diff --git a/lisp/international/mule.el b/lisp/international/mule.el
index 1229d961eaa8e732a287ff100803821941636f85..ec52eb0783aa731cae8c6fd7397469359d37405a 100644 (file)
--- a/lisp/international/mule.el
+++ b/lisp/international/mule.el
@@ -310,10 +310,13 @@ It can be retrieved with `(get-charset-property CHARSET PROPNAME)'."
   "Return dimension string of CHARSET."
   (plist-get (charset-plist charset) :dimension))
 
-(defun charset-chars (charset)
-  "Return character numbers contained in a dimension of CHARSET."
+(defun charset-chars (charset &optional dimension)
+  "Return character numbers contained in DIMENSION of CHARSET.
+DIMENSION defaults to the first dimension."
+  (unless dimension (setq dimension 1))
   (let ((code-space (plist-get (charset-plist charset) :code-space)))
-    (1+ (- (aref code-space 1) (aref code-space 0)))))
+    (1+ (- (aref code-space (1- (* 2 dimension)))
+          (aref code-space (- (* 2 dimension) 2))))))
 
 (defun charset-iso-final-char (charset)
   "Return final char of CHARSET."
@@ -1513,17 +1516,6 @@ the table in `translation-table-vector'."
           (progn ,@body)
         (set-category-table ,current-category-table)))))
 
-;; Backwards compatibility.  These might be better with :init-value t,
-;; but that breaks loadup.
-(define-minor-mode unify-8859-on-encoding-mode
-  "Obsolete."
-  :group 'mule
-  :global t)
-(define-minor-mode unify-8859-on-decoding-mode
-  "Obsolete."
-  :group 'mule
-  :global t)
-
 ;;; Initialize some variables.
 
 (put 'use-default-ascent 'char-table-extra-slots 0)