Merge from emacs--rel--22

[gnu-emacs] / lisp / international / subst-gb2312.el

diff --git a/lisp/international/subst-gb2312.el b/lisp/international/subst-gb2312.el
index dba26c9bd5caa0187021e8119a9eed2c62bedeb1..83ba31a260162bdbb1d6913c40103364764f84c4 100644 (file)
--- a/lisp/international/subst-gb2312.el
+++ b/lisp/international/subst-gb2312.el
@@ -1,6 +1,6 @@
 ;;; subst-gb2312.el --- Unicode/GB2312 translation     -*-coding: euc-china;-*-
 
-;; Copyright (C) 2002, 2004  Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007  Free Software Foundation, Inc.
 
 ;; Author: Dave Love <fx@gnu.org>
 ;; Keywords: i18n
@@ -17,8 +17,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to
-;; the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
@@ -32,9 +32,9 @@
  (lambda (pair)
    (let ((unicode (car pair))
         (char (cadr pair)))
-     (if (or (and (>= unicode #x2e80) (<= unicode #xd7a3))
-            (and (>= unicode #xff00) (<= unicode #xffef)))
-        (puthash unicode  char ucs-unicode-to-mule-cjk))
+     ;; exclude non-supporting components from decode table
+     (if (utf-translate-cjk-substitutable-p unicode)
+        (puthash unicode char ucs-unicode-to-mule-cjk))
      (puthash char unicode ucs-mule-cjk-to-unicode)))
  '((#xa4 ?¡è)
    (#xa7 ?¡ì)