Change term unification to

translation throughtout the file.

2 files changed, 12 insertions, 11 deletions

diff --git a/lisp/international/mule-conf.el b/lisp/international/mule-conf.el
index 41ac7b7971a..c6acf6b7f8b 100644
--- a/lisp/international/mule-conf.el
+++ b/lisp/international/mule-conf.el
@@ -195,17 +195,18 @@
 (setup-special-charsets)
 
 
-;; These are tables for unifying characters on decoding and encoding.
-(define-character-unification-table
+;; These are tables for translating characters on decoding and
+;; encoding.
+(define-character-translation-table
   'oldjis-newjis-jisroman-ascii
   (list (cons (make-char 'japanese-jisx0208-1978)
               (make-char 'japanese-jisx0208))
         (cons (make-char 'latin-jisx0201) (make-char 'ascii))))
 
-(setq standard-character-unification-table-for-decode
-      (get 'oldjis-newjis-jisroman-ascii 'unification-table))
+(setq standard-character-translation-table-for-decode
+      (get 'oldjis-newjis-jisroman-ascii 'character-translation-table))
 
-(setq standard-character-unification-table-for-encode nil)
+(setq standard-character-translation-table-for-encode nil)
 
 
 ;;; Make fundamental coding systems.
diff --git a/lisp/international/mule-util.el b/lisp/international/mule-util.el
index 38178be30b0..ce6076faab0 100644
--- a/lisp/international/mule-util.el
+++ b/lisp/international/mule-util.el
@@ -231,14 +231,14 @@ Optional 3rd argument NIL-FOR-TOO-LONG non-nil means return nil
   (coding-system-get coding-system 'pre-write-conversion))
 
 ;;;###autoload
-(defun coding-system-unification-table-for-decode (coding-system)
-  "Return the value of CODING-SYSTEM's unification-table-for-decode property."
-  (coding-system-get coding-system 'character-unification-table-for-decode))
+(defun coding-system-translation-table-for-decode (coding-system)
+  "Return the value of CODING-SYSTEM's translation-table-for-decode property."
+  (coding-system-get coding-system 'character-translation-table-for-decode))
 
 ;;;###autoload
-(defun coding-system-unification-table-for-encode (coding-system)
-  "Return the value of CODING-SYSTEM's unification-table-for-encode property."
-  (coding-system-get coding-system 'character-unification-table-for-encode))
+(defun coding-system-translation-table-for-encode (coding-system)
+  "Return the value of CODING-SYSTEM's translation-table-for-encode property."
+  (coding-system-get coding-system 'character-translation-table-for-encode))
 
 (defun coding-system-lessp (x y)
   (cond ((eq x 'no-conversion) t)