(coded-charset-entity-reference-alist): Use "&G-[NAME];" instead of

"&g1-[NAME];" for `=>>[NAME]'.

diff --git a/lisp/mule/mule-coding.el b/lisp/mule/mule-coding.el
index 3733172..de2e42b 100644 (file)
--- a/lisp/mule/mule-coding.el
+++ b/lisp/mule/mule-coding.el
@@ -398,23 +398,23 @@
          (=>>>jis-x0213-1                    "g2-JX1-" 4 X)
          (=>>>jis-x0213-1                    "GI-JX1-" 4 X)
          (=>>>jis-x0213-1@2004               "GI-JX3-" 4 X)
-         (=>>adobe-japan1                    "g1-AJ1-" 5 d)
-         (=>>jis-x0208                        "g1-J0-" 4 X)
-         (=>>jis-x0213-1@2000                "g1-JX1-" 4 X)
-         (=>>jis-x0213-2                     "g1-JX2-" 4 X)
-         (=>>jis-x0213-1@2004                "g1-JX3-" 4 X)
-         (=>>hanyo-denshi/ft               "g1-HD-FT-" 4 X)
-         (=>>hanyo-denshi/ia               "g1-HD-IA-" 4 X)
-         (=>>hanyo-denshi/ib               "g1-HD-IB-" 4 X)
-         (=>>hanyo-denshi/jt               "g1-HD-JT-" 4 X)
-         (=>>hanyo-denshi/ks               "g1-HD-KS-" 4 X)
-         (=>>gt                               "g1-GT-" 5 d)
-         (=>>jis-x0208@1978                  "g1-J78-" 4 X)
-         (=>>cns11643-4                       "g1-C4-" 4 X)
-         (=>>big5-cdp                        "g1-CDP-" 4 X)
-         (=>>gt-k                            "g1-GT-K" 5 d)
-         (=>>ruimoku-v6                     "g1-RUI6-" 4 X)
-         (=>>cbeta                             "g1-CB" 5 d)
+         (=>>adobe-japan1                     "G-AJ1-" 5 d)
+         (=>>jis-x0208                         "G-J0-" 4 X)
+         (=>>jis-x0213-1@2000                 "G-JX1-" 4 X)
+         (=>>jis-x0213-2                      "G-JX2-" 4 X)
+         (=>>jis-x0213-1@2004                 "G-JX3-" 4 X)
+         (=>>hanyo-denshi/ft                "G-HD-FT-" 4 X)
+         (=>>hanyo-denshi/ia                "G-HD-IA-" 4 X)
+         (=>>hanyo-denshi/ib                "G-HD-IB-" 4 X)
+         (=>>hanyo-denshi/jt                "G-HD-JT-" 4 X)
+         (=>>hanyo-denshi/ks                "G-HD-KS-" 4 X)
+         (=>>gt                                "G-GT-" 5 d)
+         (=>>jis-x0208@1978                   "G-J78-" 4 X)
+         (=>>cns11643-4                        "G-C4-" 4 X)
+         (=>>big5-cdp                         "G-CDP-" 4 X)
+         (=>>gt-k                             "G-GT-K" 5 d)
+         (=>>ruimoku-v6                      "G-RUI6-" 4 X)
+         (=>>cbeta                              "G-CB" 5 d)
          (=+>jis-x0208                         "o-J0-" 4 X)
          (=+>jis-x0213-1                      "o-JX1-" 4 X)
          (=+>jis-x0213-2                      "o-JX2-" 4 X)
@@ -446,15 +446,15 @@
          (=+>ucs@jis/1990                    "o-J90U+" 4 X)
          (=+>ucs@cns                           "o-CU+" 4 X)
          (=+>ucs@ks                            "o-KU+" 4 X)
-         (=>>ucs@iso                          "g1-IU+" 4 X)
-         (=>>ucs@unicode                      "g1-UU+" 4 X)
-         (=>>ucs@jis                          "g1-JU+" 4 X)
-         (=>>ucs@ks                           "g1-KU+" 4 X)
-         (=>>ucs@cns                          "g1-CU+" 4 X)
-         (=>>ucs@jis/2004                   "g1-J04U+" 4 X)
-         (=>>ucs@jis/2000                   "g1-J00U+" 4 X)
-         (=>>ucs@jis/1990                   "g1-J90U+" 4 X)
-         (=>>ucs@JP                          "g1-dJU+" 4 X)
+         (=>>ucs@iso                           "G-IU+" 4 X)
+         (=>>ucs@unicode                       "G-UU+" 4 X)
+         (=>>ucs@jis                           "G-JU+" 4 X)
+         (=>>ucs@ks                            "G-KU+" 4 X)
+         (=>>ucs@cns                           "G-CU+" 4 X)
+         (=>>ucs@jis/2004                    "G-J04U+" 4 X)
+         (=>>ucs@jis/2000                    "G-J00U+" 4 X)
+         (=>>ucs@jis/1990                    "G-J90U+" 4 X)
+         (=>>ucs@JP                           "G-dJU+" 4 X)
          ( =ucs@iso                               "U-" 8 X)
          ( =ucs@unicode                          "UU+" 4 X)
          ( =ucs@unicode                          "UU-" 8 X)
@@ -498,8 +498,8 @@
          ( =big5                                  "B-" 4 X)
          ( =big5                                 "C0-" 4 X)
          ( =big5-eten                            "BE-" 4 X)
-         (=>>daikanwa                         "g1-M-"  5 d)
-         (=>>daikanwa/+p                      "g1-M-p" 5 d)
+         (=>>daikanwa                          "G-M-"  5 d)
+         (=>>daikanwa/+p                       "G-M-p" 5 d)
          (=>daikanwa                            "A-M-" 5 d)
          (=>daikanwa/ho                        "A-M-H" 4 d)
          (=>cns11643-7                         "A-C7-" 4 X)