* test-utf7.el (toplevel): Use `fboundp' instead of `boundp'.

Fix (require 'utf7) order for Mule-UCS.
Add coding: comment.

diff --git a/tests/ChangeLog b/tests/ChangeLog
index 3113f69..0b48861 100644 (file)
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,3 +1,9 @@
+2009-08-01  TAKAHASHI Kaoru  <kaoru@kaisei.org>
+
+       * test-utf7.el (toplevel): Use `fboundp' instead of `boundp'.
+       Fix (require 'utf7) order for Mule-UCS.
+       Add coding: comment.
+
 2008-02-19  TAKAHASHI Kaoru  <kaoru@kaisei.org>
 
        * test-wl-util.el (test-wl-unique-id-by-user): New testcase.

diff --git a/tests/test-utf7.el b/tests/test-utf7.el
index 1cab656..8ccd392 100644 (file)
--- a/tests/test-utf7.el
+++ b/tests/test-utf7.el
@@ -1,11 +1,14 @@
+;; -*- coding: iso-2022-jp -*-
 (require 'lunit)
-(require 'utf7)
 
-;; Emacs 21.3.50 or later
-(if (boundp 'utf-translate-cjk-mode)
-    (utf-translate-cjk-mode 1)
-  ;; Use Mule-UCS if installed
+;; Emacs 21
+(unless (and (fboundp 'find-coding-system) (find-coding-system 'utf-16))
   (ignore-errors (require 'un-define)))
+(require 'utf7)
+
+;; Emacs 21.3.50 to 22
+(when (fboundp 'utf-translate-cjk-mode)
+  (utf-translate-cjk-mode 1))
 
 (luna-define-class test-utf7 (lunit-test-case))