commit f9d0fd6c1953138f7473a22917a1508740b2ce40 (HEAD, refs/remotes/origin/master)
Author: Stefan Monnier <monnier@iro.umontreal.ca>
Date:   Tue Jan 8 13:38:17 2019 -0500

    * src/window.c (save_window_save): Revert part of d82e73f
    
    ...made unnecessary by a058edae.

diff --git a/src/window.c b/src/window.c
index 4a1db932ec..72185f9340 100644
--- a/src/window.c
+++ b/src/window.c
@@ -6965,11 +6965,9 @@ save_window_save (Lisp_Object window, struct Lisp_Vector *vector, ptrdiff_t i)
 
       if (BUFFERP (w->contents))
 	{
-	  Lisp_Object buffer_local_window_point_insertion_type
-	    = (buffer_local_value (Qwindow_point_insertion_type, w->contents));
 	  bool window_point_insertion_type
-	    = (!NILP (buffer_local_window_point_insertion_type)
-	       && !EQ (buffer_local_window_point_insertion_type, Qunbound));
+	    = !NILP (buffer_local_value
+                      (Qwindow_point_insertion_type, w->contents));
 
 	  /* Save w's value of point in the window configuration.  If w
 	     is the selected window, then get the value of point from

commit f369c2cbee629177bd545b90065682f3d067f4c4
Author: Paul Eggert <eggert@cs.ucla.edu>
Date:   Tue Jan 8 10:25:50 2019 -0800

    * admin/notes/unicode: Update to match recent changes.

diff --git a/admin/notes/unicode b/admin/notes/unicode
index 084ebffb38..bbee3e9de7 100644
--- a/admin/notes/unicode
+++ b/admin/notes/unicode
@@ -230,37 +230,21 @@ nontrivial changes to the build process.
 
 	admin/charsets/mapfiles/cns2ucsdkw.txt
 
- * iso-2022-7bit
+ * iso-2022-jp
 
-     Each of these files contains just one CJK charset, but Emacs
-     currently has no easy way to specify set-charset-priority on a
-     per-file basis, so converting any of these files to UTF-8 might
-     change the file's appearance when viewed by an Emacs that is
-     operating in some other language environment.
+     This contains just one CJK charset, but Emacs currently has no
+     easy way to specify set-charset-priority on a per-file basis, so
+     converting this file to UTF-8 might change the file's appearance
+     when viewed by an Emacs that is operating in some other language
+     environment.
 
 	etc/tutorials/TUTORIAL.ja
-	lisp/international/ja-dic-cnv.el
-	lisp/international/ja-dic-utl.el
-	lisp/international/kinsoku.el
-	lisp/international/kkc.el
-	lisp/international/titdic-cnv.el
-	lisp/language/japan-util.el
-	lisp/language/japanese.el
-	lisp/leim/quail/cyril-jis.el
-	lisp/leim/quail/hanja-jis.el
-	lisp/leim/quail/japanese.el
-	lisp/leim/quail/py-punct.el
-	lisp/leim/quail/pypunct-b5.el
-
-     This file contains just Chinese characters, and has same problem.
-     Also, it contains characters that cannot be encoded in UTF-8.
-
-	lisp/international/titdic-cnv.el
 
  * utf-8-emacs
 
      These files contain characters that cannot be encoded in UTF-8.
 
+	lisp/international/titdic-cnv.el
 	lisp/language/ethio-util.el
 	lisp/language/ethiopic.el
 	lisp/language/ind-util.el

commit 875f1ae18618e250c12afcdf20a7cf7b585cbac1
Author: Stefan Monnier <monnier@iro.umontreal.ca>
Date:   Tue Jan 8 11:49:17 2019 -0500

    * lisp/emacs-lisp/map.el: Prepare for addition to GNU ELPA

diff --git a/lisp/emacs-lisp/map.el b/lisp/emacs-lisp/map.el
index 6e2ab0f950..7ec5b39625 100644
--- a/lisp/emacs-lisp/map.el
+++ b/lisp/emacs-lisp/map.el
@@ -5,6 +5,7 @@
 ;; Author: Nicolas Petton <nicolas@petton.fr>
 ;; Keywords: convenience, map, hash-table, alist, array
 ;; Version: 1.2
+;; Package-Requires: ((emacs "25"))
 ;; Package: map
 
 ;; Maintainer: emacs-devel@gnu.org

commit 35224ac3aebd4c55a4cdccea908a62f92aaebf25
Author: Stefan Monnier <monnier@iro.umontreal.ca>
Date:   Tue Jan 8 11:28:00 2019 -0500

    * lisp/help-fns.el (help--load-prefixes): Demote errors from files.

diff --git a/lisp/help-fns.el b/lisp/help-fns.el
index 04bb31485d..b4e93d36d4 100644
--- a/lisp/help-fns.el
+++ b/lisp/help-fns.el
@@ -68,6 +68,9 @@ The functions will receive the function name as argument.")
 
 (defun help--loaded-p (file)
   "Try and figure out if FILE has already been loaded."
+  ;; FIXME: this regexp business is not good enough: for file
+  ;; `toto', it will say `toto' is loaded when in reality it was
+  ;; just cedet/semantic/toto that has been loaded.
   (or (let ((feature (intern-soft file)))
         (and feature (featurep feature)))
       (let* ((re (load-history-regexp file))
@@ -83,11 +86,9 @@ The functions will receive the function name as argument.")
     (dolist (file files)
       ;; FIXME: Should we scan help-definition-prefixes to remove
       ;; other prefixes of the same file?
-      ;; FIXME: this regexp business is not good enough: for file
-      ;; `toto', it will say `toto' is loaded when in reality it was
-      ;; just cedet/semantic/toto that has been loaded.
       (unless (help--loaded-p file)
-        (load file 'noerror 'nomessage)))))
+        (with-demoted-errors "while loading: %S"
+          (load file 'noerror 'nomessage))))))
 
 (defun help--symbol-completion-table (string pred action)
   (let ((prefixes (radix-tree-prefixes (help-definition-prefixes) string)))

commit 55c5e26307a1e8f1fff74415fc560aa172a421cf
Author: Michael Albinus <michael.albinus@gmx.de>
Date:   Tue Jan 8 15:03:57 2019 +0100

    Fix nasty cut'n'waste error in Tramp
    
    * lisp/net/tramp-sudoedit.el (tramp-sudoedit-do-copy-or-rename-file):
    Remove weird code, resulting from cut'n'waste.

diff --git a/lisp/net/tramp-sudoedit.el b/lisp/net/tramp-sudoedit.el
index 6ac2012105..cab9b8d835 100644
--- a/lisp/net/tramp-sudoedit.el
+++ b/lisp/net/tramp-sudoedit.el
@@ -44,8 +44,8 @@
 (tramp--with-startup
  (add-to-list 'tramp-methods
               `(,tramp-sudoedit-method
-                (tramp-sudo-login      (("sudo") ("-u" "%u") ("-S") ("-H")
-			                ("-p" "Password:") ("--")))))
+                (tramp-sudo-login (("sudo") ("-u" "%u") ("-S") ("-H")
+			           ("-p" "Password:") ("--")))))
 
  (add-to-list 'tramp-default-user-alist '("\\`sudoedit\\'" nil "root"))
 
@@ -299,8 +299,7 @@ absolute file names."
 	  (with-parsed-tramp-file-name newname v2
 	    (tramp-flush-file-properties
 	     v2 (file-name-directory v2-localname))
-	    (tramp-flush-file-properties v2 v2-localname)
-	    (when (tramp-rclone-file-name-p newname))))))))
+	    (tramp-flush-file-properties v2 v2-localname)))))))
 
 (defun tramp-sudoedit-handle-copy-file
   (filename newname &optional ok-if-already-exists keep-date
@@ -453,7 +452,7 @@ the result will be a local, non-Tramp, file name."
 	  (delq
 	   nil
 	   (mapcar
-	    (lambda (l) (and (not (string-match-p  "^[[:space:]]*$" l)) l))
+	    (lambda (l) (and (not (string-match-p "^[[:space:]]*$" l)) l))
 	    (split-string (buffer-string) "\n" 'omit)))))))))
 
 (defun tramp-sudoedit-handle-file-readable-p (filename)
@@ -675,7 +674,7 @@ component is used as the target of the symlink."
 	    (type (and (stringp (nth 2 context)) (nth 2 context)))
 	    (range (and (stringp (nth 3 context)) (nth 3 context))))
 	(when (tramp-sudoedit-send-command
-	       v  "chcon"
+	       v "chcon"
 	       (when user (format "--user=%s" user))
 	       (when role (format "--role=%s" role))
 	       (when type (format "--type=%s" type))

commit 2f947ecafd5135c550b8f69c04d93348eed8f142
Author: Michael Albinus <michael.albinus@gmx.de>
Date:   Tue Jan 8 09:21:07 2019 +0100

    Adapt .gitlab-ci.yml
    
    * .gitlab-ci.yml (variables): Move outside jobs.  Use
    "GIT_STRATEGY: fetch".
    (before_script): Install git.
    (test-all): Rename from test.  Install inotify-tools.  Run "make
    check-expensive".
    (test-filenotify-gio): New job.

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ff51c20726..b022e4b8af 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -22,22 +22,44 @@
 # evaluation purposes, thus possibly temporary.
 
 # Maintainer: tzz@lifelogs.com
-# URL: https://gitlab.com/emacs-ci/emacs
+# URL: https://emba.gnu.org/emacs/emacs
 
 image: debian:stretch
 
+variables:
+  GIT_STRATEGY: fetch
+  EMACS_EMBA_CI: 1
+
 before_script:
   - apt update -qq
-  - DEBIAN_FRONTEND=noninteractive apt install --no-install-recommends -y -qq -o=Dpkg::Use-Pty=0 libc-dev gcc make autoconf automake libncurses-dev gnutls-dev
+  - DEBIAN_FRONTEND=noninteractive apt install --no-install-recommends -y -qq -o=Dpkg::Use-Pty=0 libc-dev gcc make autoconf automake libncurses-dev gnutls-dev git
 
 stages:
   - test
 
-test:
+test-all:
+  # This tests also file monitor libraries inotify and inotifywatch.
   stage: test
-  variables:
-    EMACS_EMBA_CI: 1
   script:
+    - DEBIAN_FRONTEND=noninteractive apt install --no-install-recommends -y -qq -o=Dpkg::Use-Pty=0 inotify-tools
     - ./autogen.sh autoconf
     - ./configure --without-makeinfo
-    - make check
+    - make bootstrap
+    - make check-expensive
+
+test-filenotify-gio:
+  stage: test
+  # This tests file monitor libraries gfilemonitor and gio.
+  only:
+    changes:
+      - .gitlab-ci.yml
+      - lisp/filenotify.el
+      - lisp/net/tramp-sh.el
+      - src/gfilenotify.c
+      - test/lisp/filenotify-tests.el
+  script:
+    - DEBIAN_FRONTEND=noninteractive apt install --no-install-recommends -y -qq -o=Dpkg::Use-Pty=0 libglib2.0-dev libglib2.0-bin libglib2.0-0
+    - ./autogen.sh autoconf
+    - ./configure --without-makeinfo --with-file-notification=gfile
+    - make bootstrap
+    - make -C test filenotify-tests

commit ebd5b5a41380eae81dd430e2721ea27102fe8b6a
Author: Leo Liu <sdl.web@gmail.com>
Date:   Tue Jan 8 12:37:22 2019 +0800

    * lisp/progmodes/js.el: Remove unused (require 'thingatpt).

diff --git a/lisp/progmodes/js.el b/lisp/progmodes/js.el
index de8f53236d..e55539c17f 100644
--- a/lisp/progmodes/js.el
+++ b/lisp/progmodes/js.el
@@ -45,13 +45,11 @@
 
 ;;; Code:
 
-
 (require 'cc-mode)
 (require 'newcomment)
-(require 'thingatpt)                    ; forward-symbol etc
 (require 'imenu)
 (require 'moz nil t)
-(require 'json nil t)
+(require 'json)
 (require 'sgml-mode)
 (require 'prog-mode)
 

commit b8c062eeb6e7091510ab0e16852917ee8e4d5f29
Author: Stefan Monnier <monnier@iro.umontreal.ca>
Date:   Mon Jan 7 21:18:40 2019 -0500

    Use utf-8 coding system for all our Elisp files
    
    * lisp/international/ja-dic-cnv.el:
    * lisp/international/ja-dic-utl.el:
    * lisp/international/kinsoku.el:
    * lisp/international/kkc.el:
    * lisp/language/japan-util.el:
    * lisp/language/japanese.el:
    * lisp/leim/quail/cyril-jis.el:
    * lisp/leim/quail/hanja-jis.el:
    * lisp/leim/quail/japanese.el:
    * lisp/leim/quail/py-punct.el:
    * lisp/leim/quail/pypunct-b5.el: Use utf-8 coding system.
    * lisp/international/titdic-cnv.el: Use utf-8-emacs coding system.

diff --git a/lisp/international/ja-dic-cnv.el b/lisp/international/ja-dic-cnv.el
index 78d2cd5ace..578cd63a59 100644
--- a/lisp/international/ja-dic-cnv.el
+++ b/lisp/international/ja-dic-cnv.el
@@ -32,15 +32,15 @@
 ;; input method (e.g. quail-japanese) can utilize the dictionary.
 
 ;; The format of SKK dictionary is quite simple.  Each line has the
-;; form "KANASTRING /CONV1/CONV2/.../" which means KANASTRING ($B2>L>J8(B
-;; $B;zNs(B) can be converted to one of CONVi.  CONVi is a Kanji ($B4A;z(B)
-;; and Kana ($B2>L>(B) mixed string.
+;; form "KANASTRING /CONV1/CONV2/.../" which means KANASTRING (仮名文
+;; 字列) can be converted to one of CONVi.  CONVi is a Kanji (漢字)
+;; and Kana (仮名) mixed string.
 ;;
-;; KANASTRING may have a trailing ASCII letter for Okurigana ($BAw$j2>L>(B)
+;; KANASTRING may have a trailing ASCII letter for Okurigana (送り仮名)
 ;; information.  For instance, the trailing letter `k' means that one
-;; of the following Okurigana is allowed: $B$+$-$/$1$3(B.  So, in that
-;; case, the string "KANASTRING$B$/(B" can be converted to one of "CONV1$B$/(B",
-;; CONV2$B$/(B, ...
+;; of the following Okurigana is allowed: かきくけこ.  So, in that
+;; case, the string "KANASTRINGく" can be converted to one of "CONV1く",
+;; CONV2く, ...
 
 ;;; Code:
 
@@ -76,25 +76,25 @@
 (defconst skkdic-postfix-list '(skkdic-postfix-list))
 
 (defconst skkdic-postfix-data
-  '(("$B$$$-(B" "$B9T(B")
-    ("$B$,$+$j(B" "$B78(B")
-    ("$B$,$/(B" "$B3X(B")
-    ("$B$,$o(B" "$B@n(B")
-    ("$B$7$c(B" "$B<R(B")
-    ("$B$7$e$&(B" "$B=8(B")
-    ("$B$7$g$&(B" "$B>^(B" "$B>k(B")
-    ("$B$8$g$&(B" "$B>k(B")
-    ("$B$;$s(B" "$B@~(B")
-    ("$B$@$1(B" "$B3Y(B")
-    ("$B$A$c$/(B" "$BCe(B")
-    ("$B$F$s(B" "$BE9(B")
-    ("$B$H$&$2(B" "$BF=(B")
-    ("$B$I$*$j(B" "$BDL$j(B")
-    ("$B$d$^(B" "$B;3(B")
-    ("$B$P$7(B" "$B66(B")
-    ("$B$O$D(B" "$BH/(B")
-    ("$B$b$/(B" "$BL\(B")
-    ("$B$f$-(B" "$B9T(B")))
+  '(("いき" "行")
+    ("がかり" "係")
+    ("がく" "学")
+    ("がわ" "川")
+    ("しゃ" "社")
+    ("しゅう" "集")
+    ("しょう" "賞" "城")
+    ("じょう" "城")
+    ("せん" "線")
+    ("だけ" "岳")
+    ("ちゃく" "着")
+    ("てん" "店")
+    ("とうげ" "峠")
+    ("どおり" "通り")
+    ("やま" "山")
+    ("ばし" "橋")
+    ("はつ" "発")
+    ("もく" "目")
+    ("ゆき" "行")))
 
 (defun skkdic-convert-postfix (skkbuf buf)
   (message "Processing POSTFIX entries ...")
@@ -124,7 +124,7 @@
 	(setq l (cdr l)))))
 
   ;; Search postfix entries.
-  (while (re-search-forward "^[#<>?]\\(\\(\\cH\\|$B!<(B\\)+\\) " nil t)
+  (while (re-search-forward "^[#<>?]\\(\\(\\cH\\|ー\\)+\\) " nil t)
     (let ((kana (match-string-no-properties 1))
 	  str candidates)
       (while (looking-at "/[#0-9 ]*\\([^/\n]*\\)/")
@@ -157,7 +157,7 @@
     (insert ";; Setting prefix entries.\n"
 	    "(skkdic-set-prefix\n"))
   (save-excursion
-    (while (re-search-forward "^\\(\\(\\cH\\|$B!<(B\\)+\\)[<>?] " nil t)
+    (while (re-search-forward "^\\(\\(\\cH\\|ー\\)+\\)[<>?] " nil t)
       (let ((kana (match-string-no-properties 1))
 	    str candidates)
 	(while (looking-at "/\\([^/\n]+\\)/")
@@ -275,7 +275,7 @@
     (let ((progress (make-progress-reporter "Collecting OKURI-NASI entries"
                                             (point) (point-max)
                                             nil 10)))
-      (while (re-search-forward "^\\(\\(\\cH\\|$B!<(B\\)+\\) \\(/\\cj.*\\)/$"
+      (while (re-search-forward "^\\(\\(\\cH\\|ー\\)+\\) \\(/\\cj.*\\)/$"
 				nil t)
         (let ((kana (match-string-no-properties 1))
 	      (candidates (skkdic-get-candidate-list (match-beginning 3)
@@ -452,7 +452,7 @@ To get complete usage, invoke:
       (aset vec i
 	    (if (< ch 128)		; CH is an ASCII letter for OKURIGANA,
 		(- ch)			;  represented by a negative code.
-	      (if (= ch ?$B!<(B)		; `$B!<(B' is represented by 0.
+	      (if (= ch ?ー)		; `ー' is represented by 0.
 		  0
 		(- (logand (encode-char ch 'japanese-jisx0208) #xFF) 32))))
       (setq i (1+ i)))
@@ -541,9 +541,4 @@ To get complete usage, invoke:
 	 map)))
 
 (provide 'ja-dic-cnv)
-
-;; Local Variables:
-;; coding: iso-2022-7bit
-;; End:
-
 ;;; ja-dic-cnv.el ends here
diff --git a/lisp/international/ja-dic-utl.el b/lisp/international/ja-dic-utl.el
index 86ba3749df..498fb23f70 100644
--- a/lisp/international/ja-dic-utl.el
+++ b/lisp/international/ja-dic-utl.el
@@ -53,23 +53,23 @@
   "Nested alist for OKURI-NASI entries of SKK dictionary.")
 
 (defconst skkdic-okurigana-table
-  '((?$B$!(B . ?a) (?$B$"(B . ?a) (?$B$#(B . ?i) (?$B$$(B . ?i) (?$B$%(B . ?u)
-    (?$B$&(B . ?u) (?$B$'(B . ?e) (?$B$((B . ?e) (?$B$)(B . ?o) (?$B$*(B . ?o)
-    (?$B$+(B . ?k) (?$B$,(B . ?g) (?$B$-(B . ?k) (?$B$.(B . ?g) (?$B$/(B . ?k)
-    (?$B$0(B . ?g) (?$B$1(B . ?k) (?$B$2(B . ?g) (?$B$3(B . ?k) (?$B$4(B . ?g)
-    (?$B$5(B . ?s) (?$B$6(B . ?z) (?$B$7(B . ?s) (?$B$8(B . ?j) (?$B$9(B . ?s)
-    (?$B$:(B . ?z) (?$B$;(B . ?s) (?$B$<(B . ?z) (?$B$=(B . ?s) (?$B$>(B . ?z)
-    (?$B$?(B . ?t) (?$B$@(B . ?d) (?$B$A(B . ?t) (?$B$B(B . ?d) (?$B$C(B . ?t)
-    (?$B$D(B . ?t) (?$B$E(B . ?d) (?$B$F(B . ?t) (?$B$G(B . ?d) (?$B$H(B . ?t) (?$B$I(B . ?d)
-    (?$B$J(B . ?n) (?$B$K(B . ?n) (?$B$L(B . ?n) (?$B$M(B . ?n) (?$B$N(B . ?n)
-    (?$B$O(B . ?h) (?$B$P(B . ?b) (?$B$Q(B . ?p) (?$B$R(B . ?h) (?$B$S(B . ?b)
-    (?$B$T(B . ?p) (?$B$U(B . ?h) (?$B$V(B . ?b) (?$B$W(B . ?p) (?$B$X(B . ?h)
-    (?$B$Y(B . ?b) (?$B$Z(B . ?p) (?$B$[(B . ?h) (?$B$\(B . ?b) (?$B$](B . ?p)
-    (?$B$^(B . ?m) (?$B$_(B . ?m) (?$B$`(B . ?m) (?$B$a(B . ?m) (?$B$b(B . ?m)
-    (?$B$c(B . ?y) (?$B$d(B . ?y) (?$B$e(B . ?y) (?$B$f(B . ?y) (?$B$g(B . ?y) (?$B$h(B . ?y)
-    (?$B$i(B . ?r) (?$B$j(B . ?r) (?$B$k(B . ?r) (?$B$l(B . ?r) (?$B$m(B . ?r)
-    (?$B$o(B . ?w) (?$B$p(B . ?w) (?$B$q(B . ?w) (?$B$r(B . ?w)
-    (?$B$s(B . ?n)
+  '((?ぁ . ?a) (?あ . ?a) (?ぃ . ?i) (?い . ?i) (?ぅ . ?u)
+    (?う . ?u) (?ぇ . ?e) (?え . ?e) (?ぉ . ?o) (?お . ?o)
+    (?か . ?k) (?が . ?g) (?き . ?k) (?ぎ . ?g) (?く . ?k)
+    (?ぐ . ?g) (?け . ?k) (?げ . ?g) (?こ . ?k) (?ご . ?g)
+    (?さ . ?s) (?ざ . ?z) (?し . ?s) (?じ . ?j) (?す . ?s)
+    (?ず . ?z) (?せ . ?s) (?ぜ . ?z) (?そ . ?s) (?ぞ . ?z)
+    (?た . ?t) (?だ . ?d) (?ち . ?t) (?ぢ . ?d) (?っ . ?t)
+    (?つ . ?t) (?づ . ?d) (?て . ?t) (?で . ?d) (?と . ?t) (?ど . ?d)
+    (?な . ?n) (?に . ?n) (?ぬ . ?n) (?ね . ?n) (?の . ?n)
+    (?は . ?h) (?ば . ?b) (?ぱ . ?p) (?ひ . ?h) (?び . ?b)
+    (?ぴ . ?p) (?ふ . ?h) (?ぶ . ?b) (?ぷ . ?p) (?へ . ?h)
+    (?べ . ?b) (?ぺ . ?p) (?ほ . ?h) (?ぼ . ?b) (?ぽ . ?p)
+    (?ま . ?m) (?み . ?m) (?む . ?m) (?め . ?m) (?も . ?m)
+    (?ゃ . ?y) (?や . ?y) (?ゅ . ?y) (?ゆ . ?y) (?ょ . ?y) (?よ . ?y)
+    (?ら . ?r) (?り . ?r) (?る . ?r) (?れ . ?r) (?ろ . ?r)
+    (?わ . ?w) (?ゐ . ?w) (?ゑ . ?w) (?を . ?w)
+    (?ん . ?n)
     )
   "Alist of Okuriganas vs trailing ASCII letters in OKURI-ARI entry.")
 
@@ -125,14 +125,14 @@ LEIM is available from the same ftp directory as Emacs.")))
     ;; At first, generate vector VEC from SEQ for looking up SKK
     ;; alists.  Nth element in VEC corresponds to Nth element in SEQ.
     ;; The values are decided as follows.
-    ;;   If SEQ[N] is `$B!<(B', VEC[N] is 0,
+    ;;   If SEQ[N] is `ー', VEC[N] is 0,
     ;;   else if SEQ[N] is a Hiragana character, VEC[N] is:
     ;;     ((The 2nd position code of SEQ[N]) - 32),
     ;;   else VEC[N] is 128.
     (while (< i len)
       (let ((ch (aref seq i))
 	    code)
-	(cond ((= ch ?$B!<(B)
+	(cond ((= ch ?ー)
 	       (aset vec i 0))
 	      ((and (>= ch (car skkdic-jisx0208-hiragana-block))
 		    (<= ch (cdr skkdic-jisx0208-hiragana-block)))
@@ -218,9 +218,4 @@ LEIM is available from the same ftp directory as Emacs.")))
 
 ;;
 (provide 'ja-dic-utl)
-
-;; Local Variables:
-;; coding: iso-2022-7bit
-;; End:
-
 ;;; ja-dic-utl.el ends here
diff --git a/lisp/international/kinsoku.el b/lisp/international/kinsoku.el
index 376d23b1fa..690a80e659 100644
--- a/lisp/international/kinsoku.el
+++ b/lisp/international/kinsoku.el
@@ -1,4 +1,4 @@
-;;; kinsoku.el --- `Kinsoku' processing funcs -*- coding: iso-2022-7bit; -*-
+;;; kinsoku.el --- `Kinsoku' processing funcs
 
 ;; Copyright (C) 1997, 2001-2019 Free Software Foundation, Inc.
 ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
@@ -62,19 +62,19 @@ The value 0 means there's no limitation.")
 		   idx (1+ idx)))
 	   str2)
 	 ;; Katakana JISX0201
-	 "(I!#'()*+,-./0^_(B"
+	 "｡｣ｧｨｩｪｫｬｭｮｯｰﾞﾟ"
 	 ;; Japanese JISX0208
-	 "$B!"!#!$!%!&!'!(!)!*!+!,!-!.!/!0!1!2!3!4!5!6!7!8!9!:!;!<!=!>(B\
-$B!?!@!A!B!C!D!E!G!I!K!M!O!Q!S!U!W!Y![!k!l!m!n(B\
-$B$!$#$%$'$)$C$c$e$g$n%!%#%%%'%)%C%c%e%g%n%u%v(B"
+	 "、。，．・：；？！゛゜´｀¨＾￣＿ヽヾゝゞ〃仝々〆〇ー—‐\
+／＼〜‖｜…‥’”）〕］｝〉》」』】°′″℃\
+ぁぃぅぇぉっゃゅょゎァィゥェォッャュョヮヵヶ"
 	 ;; Chinese GB2312
-	 "$A!"!##.#,!$!%!&!'!(!)!*!+!,!-!/!1#)!3!5!7!9!;!=(B\
-$A!?#;#:#?#!!@!A!B!C!c!d!e!f#/#\#"#_#~#|(e(B"
+	 "、。．，・ˉˇ¨〃々―～‖…’”）〕〉》」』〗\
+】；：？！±×÷∶°′″℃／＼＂＿￣｜ㄥ"
 	 ;; Chinese BIG5
-	 "$(0!"!#!$!%!&!'!(!)!*!+!,!-!.!/!0!1!2(B\
-$(0!3!4!5!6!7!8!9!:!;!<!=!?!A!C!E!G!I!K(B\
-$(0!M!O!Q!S!U!W!Y![!]!_!a!c!e!g!i!k!q(B\
-$(0"#"$"%"&"'"(")"*"+","2"3"4"j"k"l"x%7(B"))
+	 "，、。．‧；：？！︰…‥﹐﹑﹒·﹔\
+﹕﹖﹗｜–︱—︳╴︴﹏）︶｝︸〕︺】\
+︼》︾〉﹀」﹂』﹄﹚﹜﹞’”〞′〃\
+¯￣＿ˍ﹉﹊﹍﹎﹋﹌×÷±℃℉﹩°ㄥ"))
        (len (length kinsoku-bol))
        (idx 0)
        ch)
@@ -102,16 +102,16 @@ The value 0 means there's no limitation.")
 		   idx (1+ idx)))
 	   str2)
 	 ;; JISX0201 Katakana
-	 "(I"(B"
+	 "｢"
 	 ;; Japanese JISX0208
-	 "$B!F!H!J!L!N!P!R!T!V!X!Z!k!l!m!n!w!x(B"
+	 "‘“（〔［｛〈《「『【°′″℃＠§"
 	 ;; Chinese GB2312
-         "$A!.!0#"#(!2!4!6!8!:!<!>!c!d!e#@!f!l(B\
-$A(E(F(G(H(I(J(K(L(M(N(O(P(Q(R(S(T(U(V(W(X(Y(h(B\
-\$(0!>!@!B!D!F!H!J!L!N!P!R!T!V!X!Z!\!^!`!b(B"
+         "‘“＂（〔〈《「『〖【°′″＠℃§\
+ㄅㄆㄇㄈㄉㄊㄋㄌㄍㄎㄏㄐㄑㄒㄓㄔㄕㄖㄗㄘㄙㄨ\
+\（︵｛︷〔︹【︻《︽〈︿「﹁『﹃﹙﹛﹝"
 	 ;; Chinese BIG5
-	 "$(0!d!f!h!j!k!q!p"i"j"k"n"x$u$v$w$x$y$z${(B\
-$(0$|$}$~%!%"%#%$%%%&%'%(%)%*%+%:(B"))
+	 "‘“〝‵′〃§＠℃℉﹫°ㄅㄆㄇㄈㄉㄊㄋ\
+ㄌㄍㄎㄏㄐㄑㄒㄓㄔㄕㄖㄗㄘㄙㄨ"))
        (len (length kinsoku-eol))
        (idx 0)
        ch)
diff --git a/lisp/international/kkc.el b/lisp/international/kkc.el
index df56ce2616..6691ee9eb9 100644
--- a/lisp/international/kkc.el
+++ b/lisp/international/kkc.el
@@ -1,4 +1,4 @@
-;;; kkc.el --- Kana Kanji converter    -*- coding: iso-2022-7bit; -*-
+;;; kkc.el --- Kana Kanji converter
 
 ;; Copyright (C) 1997-1998, 2001-2019 Free Software Foundation, Inc.
 ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
@@ -36,7 +36,7 @@
 
 (require 'ja-dic-utl)
 
-(defvar kkc-input-method-title "$B4A(B"
+(defvar kkc-input-method-title "漢"
   "String denoting KKC input method.
 This string is shown at mode line when users are in KKC mode.")
 
diff --git a/lisp/international/titdic-cnv.el b/lisp/international/titdic-cnv.el
index ed020fe32a..f1a81018cb 100644
--- a/lisp/international/titdic-cnv.el
+++ b/lisp/international/titdic-cnv.el
@@ -1,4 +1,4 @@
-;;; titdic-cnv.el --- convert cxterm dictionary (TIT format) to Quail package -*- coding:iso-2022-7bit; -*-
+;;; titdic-cnv.el --- convert cxterm dictionary (TIT format) to Quail package -*- coding:utf-8-emacs -*-
 
 ;; Copyright (C) 1997-1998, 2000-2019 Free Software Foundation, Inc.
 ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
@@ -83,9 +83,9 @@
 ;; how to select a translation from a list of candidates.
 
 (defvar quail-cxterm-package-ext-info
-  '(("chinese-4corner" "$(0(?-F(B")
-    ("chinese-array30" "$(0#R#O(B")
-    ("chinese-ccdospy" "$AKuF4(B"
+  '(("chinese-4corner" "四角")
+    ("chinese-array30" "３０")
+    ("chinese-ccdospy" "缩拼"
      "Pinyin base input method for Chinese charset GB2312 (`chinese-gb2312').
 
 Pinyin is the standard Roman transliteration method for Chinese.
@@ -94,10 +94,10 @@ method `chinese-py'.
 
 This input method works almost the same way as `chinese-py'.  The
 difference is that you type a single key for these Pinyin spelling.
-    Pinyin:  zh  en  eng ang ch  an  ao  ai  ong sh  ing  yu($A(9(B)
+    Pinyin:  zh  en  eng ang ch  an  ao  ai  ong sh  ing  yu(ü)
     keyseq:   a   f   g   h   i   j   k   l   s   u   y   v
 For example:
-    Chinese:  $A0!(B    $A9{(B    $AVP(B    $AND(B    $A9b(B    $ASq(B    $AH+(B
+    Chinese:  啊    果    中    文    光    玉    全
     Pinyin:   a    guo   zhong  wen  guang  yu   quan
     Keyseq:   a1   guo4   as1   wf4  guh1  yu..6 qvj6
 
@@ -106,14 +106,14 @@ For example:
 For double-width GB2312 characters corresponding to ASCII, use the
 input method `chinese-qj'.")
 
-    ("chinese-ecdict" "$(05CKH(B"
+    ("chinese-ecdict" "英漢"
 "In this input method, you enter a Chinese (Big5) character or word
 by typing the corresponding English word.  For example, if you type
-\"computer\", \"$(0IZH+(B\" is input.
+\"computer\", \"電腦\" is input.
 
 \\<quail-translation-docstring>")
 
-    ("chinese-etzy" "$(06/0D(B"
+    ("chinese-etzy" "倚注"
 "Zhuyin base input method for Chinese Big5 characters (`chinese-big5-1',
 `chinese-big5-2').
 
@@ -122,20 +122,20 @@ compose one Chinese character.
 
 In this input method, you enter a Chinese character by first typing
 keys corresponding to Zhuyin symbols (see the above table) followed by
-SPC, 1, 2, 3, or 4 specifying a tone (SPC:$(0?v(N(B, 1:$(0M=Vy(B, 2:$(0Dm(N(B, 3: $(0&9Vy(B,
-4:$(0(+Vy(B).
+SPC, 1, 2, 3, or 4 specifying a tone (SPC:陰平, 1:輕聲, 2:陽平, 3: 上聲,
+4:去聲).
 
 \\<quail-translation-docstring>")
 
-    ("chinese-punct-b5" "$(0O:(BB"
+    ("chinese-punct-b5" "標B"
      "Input method for Chinese punctuation and symbols of Big5
 \(`chinese-big5-1' and `chinese-big5-2').")
 
-    ("chinese-punct" "$A1j(BG"
+    ("chinese-punct" "标G"
      "Input method for Chinese punctuation and symbols of GB2312
 \(`chinese-gb2312').")
 
-    ("chinese-py-b5" "$(03<(BB"
+    ("chinese-py-b5" "拼B"
      "Pinyin base input method for Chinese Big5 characters
 \(`chinese-big5-1', `chinese-big5-2').
 
@@ -153,28 +153,28 @@ method `chinese-qj-b5'.
 The input method `chinese-py' and `chinese-tonepy' are also Pinyin
 based, but for the character set GB2312 (`chinese-gb2312').")
 
-    ("chinese-qj-b5" "$(0)A(BB")
+    ("chinese-qj-b5" "全B")
 
-    ("chinese-qj" "$AH+(BG")
+    ("chinese-qj" "全G")
 
-    ("chinese-sw" "$AJWN2(B"
+    ("chinese-sw" "首尾"
 "Radical base input method for Chinese charset GB2312 (`chinese-gb2312').
 
 In this input method, you enter a Chinese character by typing two
-keys.  The first key corresponds to the first ($AJW(B) radical, the second
-key corresponds to the last ($AN2(B) radical.  The correspondence of keys
+keys.  The first key corresponds to the first (首) radical, the second
+key corresponds to the last (尾) radical.  The correspondence of keys
 and radicals is as below:
 
  first radical:
  a  b  c  d  e  f  g  h  i  j  k  l  m  n  o  p  q  r  s  t  u  v  w  x  y  z
- $APD(B $AZ"(B $AJ,(B $AX<(B $A;p(B $A?Z(B $A^P(B $Ac_(B $AZ%(B $A\3(B $AXi(B $AD>(B $Alj(B $Ab;(B $ATB(B $Afy(B $AJ/(B $AMu(B $A0K(B $AX/(B $AHU(B $AeA(B $Aak(B $AVq(B $AR;(B $AHK(B
+ 心 冖 尸 丶 火 口 扌 氵 讠 艹 亻 木 礻 饣 月 纟 石 王 八 丿 日 辶 犭 竹 一 人
  last radical:
  a  b  c  d  e  f  g  h  i  j  k  l  m  n  o  p  q  r  s  t  u  v  w  x  y  z
- $ASV(B $AI=(B $AMA(B $A56(B $AZb(B $A?Z(B $ARB(B $Aqb(B $A4s(B $A6!(B $A[L(B $Ala(B $AJ.(B $A4u(B $AXg(B $ACE(B $A=q(B $AX-(B $AE.(B $ARR(B $A`m(B $AP!(B $A3'(B $A3f(B $A_.(B $A27(B
+ 又 山 土 刀 阝 口 衣 疋 大 丁 厶 灬 十 歹 冂 门 今 丨 女 乙 囗 小 厂 虫 弋 卜
 
 \\<quail-translation-docstring>")
 
-    ("chinese-tonepy" "$A5wF4(B"
+    ("chinese-tonepy" "调拼"
      "Pinyin base input method for Chinese charset GB2312 (`chinese-gb2312').
 
 Pinyin is the standard roman transliteration method for Chinese.
@@ -183,18 +183,18 @@ method `chinese-py'.
 
 This input method works almost the same way as `chinese-py'.  The
 difference is that you must type 1..5 after each Pinyin spelling to
-specify a tone (1:$ARuF=(B, 2:$AQtF=(B, 3:$AIOIy(B, 4$AOBIy(B, 5:$AGaIy(B).
+specify a tone (1:阴平, 2:阳平, 3:上声, 4下声, 5:轻声).
 
 \\<quail-translation-docstring>
 
-For instance, to input $ADc(B, you type \"n i 3 3\", the first \"n i\" is
+For instance, to input 你, you type \"n i 3 3\", the first \"n i\" is
 a Pinyin, the next \"3\" specifies tone, and the last \"3\" selects
 the third character from the candidate list.
 
 For double-width GB2312 characters corresponding to ASCII, use the
 input method `chinese-qj'.")
 
-    ("chinese-zozy" "$(0I\0D(B"
+    ("chinese-zozy" "零注"
 "Zhuyin base input method for Chinese Big5 characters (`chinese-big5-1',
 `chinese-big5-2').
 
@@ -203,8 +203,8 @@ compose a Chinese character.
 
 In this input method, you enter a Chinese character by first typing
 keys corresponding to Zhuyin symbols (see the above table) followed by
-SPC, 6, 3, 4, or 7 specifying a tone (SPC:$(0?v(N(B, 6:$(0Dm(N(B, 3:$(0&9Vy(B, 4:$(0(+Vy(B,
-7:$(0M=Vy(B).
+SPC, 6, 3, 4, or 7 specifying a tone (SPC:陰平, 6:陽平, 3:上聲, 4:去聲,
+7:輕聲).
 
 \\<quail-translation-docstring>")))
 
@@ -348,7 +348,7 @@ SPC, 6, 3, 4, or 7 specifying a tone (SPC:$(0?v(N(B, 6:$(0Dm(N(B, 3:$(0&9Vy
       (princ (nth 2 (assoc tit-encode tit-encode-list)))
       (princ "\" \"")
       (princ (or title
-		 (if (string-match "[:$A!K$(0!(!J(B]+\\([^:$A!K$(0!(!K(B]+\\)" tit-prompt)
+		 (if (string-match "[:∷：【]+\\([^:∷：】]+\\)" tit-prompt)
 		     (substring tit-prompt (match-beginning 1) (match-end 1))
 		   tit-prompt)))
       (princ "\"\n"))
@@ -579,7 +579,7 @@ To get complete usage, invoke \"emacs -batch -f batch-titdic-convert -h\"."
 ;;    )
 
 (defvar quail-misc-package-ext-info
-  '(("chinese-b5-tsangchi" "$(06A(BB"
+  '(("chinese-b5-tsangchi" "倉B"
      "cangjie-table.b5" big5 "tsang-b5.el"
      tsang-b5-converter
      "\
@@ -589,7 +589,7 @@ To get complete usage, invoke \"emacs -batch -f batch-titdic-convert -h\"."
 ;; # unmodified versions is granted without royalty provided
 ;; # this notice is preserved.")
 
-    ("chinese-b5-quick" "$(0X|(BB"
+    ("chinese-b5-quick" "簡B"
      "cangjie-table.b5" big5 "quick-b5.el"
      quick-b5-converter
      "\
@@ -599,7 +599,7 @@ To get complete usage, invoke \"emacs -batch -f batch-titdic-convert -h\"."
 ;; # unmodified versions is granted without royalty provided
 ;; # this notice is preserved.")
 
-    ("chinese-cns-tsangchi" "$(GT?(BC"
+    ("chinese-cns-tsangchi" "倉C"
      "cangjie-table.cns" iso-2022-cn-ext "tsang-cns.el"
      tsang-cns-converter
      "\
@@ -609,7 +609,7 @@ To get complete usage, invoke \"emacs -batch -f batch-titdic-convert -h\"."
 ;; # unmodified versions is granted without royalty provided
 ;; # this notice is preserved.")
 
-    ("chinese-cns-quick" "$(Gv|(BC"
+    ("chinese-cns-quick" "簡C"
      "cangjie-table.cns" iso-2022-cn-ext "quick-cns.el"
      quick-cns-converter
      "\
@@ -619,7 +619,7 @@ To get complete usage, invoke \"emacs -batch -f batch-titdic-convert -h\"."
 ;; # unmodified versions is granted without royalty provided
 ;; # this notice is preserved.")
 
-    ("chinese-py" "$AF4(BG"
+    ("chinese-py" "拼G"
      "pinyin.map" cn-gb-2312 "PY.el"
      py-converter
      "\
@@ -647,7 +647,7 @@ To get complete usage, invoke \"emacs -batch -f batch-titdic-convert -h\"."
 ;; You should have received a copy of the GNU General Public License along with
 ;; CCE.  If not, see <https://www.gnu.org/licenses/>.")
 
-    ("chinese-ziranma" "$AWTH;(B"
+    ("chinese-ziranma" "自然"
      "ziranma.cin" cn-gb-2312 "ZIRANMA.el"
      ziranma-converter
      "\
@@ -675,7 +675,7 @@ To get complete usage, invoke \"emacs -batch -f batch-titdic-convert -h\"."
 ;; You should have received a copy of the GNU General Public License along with
 ;; CCE.  If not, see <https://www.gnu.org/licenses/>.")
 
-    ("chinese-ctlau" "$AAuTA(B"
+    ("chinese-ctlau" "刘粤"
      "CTLau.html" cn-gb-2312 "CTLau.el"
      ctlau-gb-converter
      "\
@@ -700,7 +700,7 @@ To get complete usage, invoke \"emacs -batch -f batch-titdic-convert -h\"."
 ;; # You should have received a copy of the GNU General Public License
 ;; # along with this program.  If not, see <https://www.gnu.org/licenses/>.")
 
-    ("chinese-ctlaub" "$(0N,Gn(B"
+    ("chinese-ctlaub" "劉粵"
      "CTLau-b5.html" big5 "CTLau-b5.el"
      ctlau-b5-converter
      "\
@@ -730,38 +730,38 @@ To get complete usage, invoke \"emacs -batch -f batch-titdic-convert -h\"."
 ;; dictionary in the buffer DICBUF.  The input method name of the
 ;; Quail package is NAME, and the title string is TITLE.
 
-;; TSANG-P is non-nil, generate $(06AQo(B input method.  Otherwise
-;; generate $(0X|/y(B (simple version of $(06AQo(B).  If BIG5-P is non-nil, the
+;; TSANG-P is non-nil, generate 倉頡 input method.  Otherwise
+;; generate 簡易 (simple version of 倉頡).  If BIG5-P is non-nil, the
 ;; input method is for inputting Big5 characters.  Otherwise the input
 ;; method is for inputting CNS characters.
 
 (defun tsang-quick-converter (dicbuf name title tsang-p big5-p)
-  (let ((fulltitle (if tsang-p (if big5-p "$(06AQo(B" "$(GT?on(B")
-		     (if big5-p "$(0X|/y(B" "$(Gv|Mx(B")))
+  (let ((fulltitle (if tsang-p (if big5-p "倉頡" "倉頡")
+		     (if big5-p "簡易" "簡易")))
 	dic)
     (goto-char (point-max))
     (if big5-p
-	(insert (format "\"$(0&d'GTT&,!J(B%s$(0!K(BBIG5
+	(insert (format "\"中文輸入【%s】BIG5
 
-	$(0KHM$(B%s$(0TT&,WoOu(B
+	漢語%s輸入鍵盤
 
-   [Q $(0'D(B] [W $(0(q(B] [E $(0'V(B] [R $(0&H(B] [T $(0'>(B] [Y $(0&4(B] [U $(0&U(B] [I $(0'B(B] [O $(0&*(B] [P $(0'A(B]
+   [Q 手] [W 田] [E 水] [R 口] [T 廿] [Y 卜] [U 山] [I 戈] [O 人] [P 心]
 
-    [A $(0'K(B] [S $(0&T(B] [D $(0'N(B] [F $(0'W(B] [G $(0&I(B] [H $(0*M(B] [J $(0&3(B] [L $(0&d(B]
+    [A 日] [S 尸] [D 木] [F 火] [G 土] [H 竹] [J 十] [L 中]
 
-      [Z  ] [X $(0[E(B] [C $(01[(B] [V $(0&M(B] [B $(0'M(B] [N $(0&_(B] [M $(0&"(B]
+      [Z  ] [X 難] [C 金] [V 女] [B 月] [N 弓] [M 一]
 
 \\\\<quail-translation-docstring>\"\n"
 			fulltitle fulltitle))
-      (insert (format "\"$(GDcEFrSD+!J(B%s$(G!K(BCNS
+      (insert (format "\"中文輸入【%s】CNS
 
-	$(GiGk#(B%s$(GrSD+uomu(B
+	漢語%s輸入鍵盤
 
-   [Q $(GEC(B] [W $(GFp(B] [E $(GEU(B] [R $(GDG(B] [T $(GE=(B] [Y $(GD3(B] [U $(GDT(B] [I $(GEA(B] [O $(GD)(B] [P $(GE@(B]
+   [Q 手] [W 田] [E 水] [R 口] [T 廿] [Y 卜] [U 山] [I 戈] [O 人] [P 心]
 
-    [A $(GEJ(B] [S $(GDS(B] [D $(GEM(B] [F $(GEV(B] [G $(GDH(B] [H $(GHL(B] [J $(GD2(B] [L $(GDc(B]
+    [A 日] [S 尸] [D 木] [F 火] [G 土] [H 竹] [J 十] [L 中]
 
-      [Z  ] [X $(GyE(B] [C $(GOZ(B] [V $(GDL(B] [B $(GEL(B] [N $(GD^(B] [M $(GD!(B]
+      [Z  ] [X 難] [C 金] [V 女] [B 月] [N 弓] [M 一]
 
 \\\\<quail-translation-docstring>\"\n"
 		      fulltitle fulltitle)))
@@ -797,35 +797,35 @@ To get complete usage, invoke \"emacs -batch -f batch-titdic-convert -h\"."
     (setq dic (sort dic (function (lambda (x y) (string< (car x ) (car y))))))
     (dolist (elt dic)
       (insert (format "(%S\t%S)\n" (car elt) (cdr elt))))
-    (let ((punctuation '((";" "$(0!'!2!"!#!.!/(B" "$(G!'!2!"!#!.!/(B")
-			 (":" "$(0!(!+!3!%!$!&!0!1(B" "$(G!(!+!3!%!$!&!0!1(B")
-			 ("'" "$(0!e!d(B" "$(G!e!d(B")
-			 ("\"" "$(0!g!f!h!i!q(B" "$(G!g!f!h!i!q(B")
-			 ("\\" "$(0"`"b#M(B" "$(G"`"b#M(B")
-			 ("|" "$(0!6!8!:"^(B" "$(G!6!8!:"^(B")
-			 ("/" "$(0"_"a#L(B" "$(G"_"a#L(B")
-			 ("?" "$(0!)!4(B" "$(G!)!4(B")
-			 ("<" "$(0!R"6"A!T"H(B" "$(G!R"6"A!T"H(B")
-			 (">" "$(0!S"7"B!U(B" "$(G!S"7"B!U(B")
-			 ("[" "$(0!F!J!b!H!L!V!Z!X!\(B" "$(G!F!J!b!H!L!V!Z!X!\(B")
-			 ("]" "$(0!G!K!c!I!M!W![!Y!](B" "$(G!G!K!c!I!M!W![!Y!](B")
-			 ("{" "$(0!B!`!D(B " "$(G!B!`!D(B ")
-			 ("}" "$(0!C!a!E(B" "$(G!C!a!E(B")
-			 ("`" "$(0!j!k(B" "$(G!j!k(B")
-			 ("~" "$(0"D"+",!<!=(B" "$(G"D"+",!<!=(B")
-			 ("!" "$(0!*!5(B" "$(G!*!5(B")
-			 ("@" "$(0"i"n(B" "$(G"i"n(B")
-			 ("#" "$(0!l"-(B" "$(G!l"-(B")
-			 ("$" "$(0"c"l(B" "$(G"c"l(B")
-			 ("%" "$(0"h"m(B" "$(G"h"m(B")
-			 ("&" "$(0!m".(B" "$(G!m".(B")
-			 ("*" "$(0!n"/!o!w!x(B" "$(G!n"/!o!w!x(B")
-			 ("(" "$(0!>!^!@(B" "$(G!>!^!@(B")
-			 (")" "$(0!?!_!A(B" "$(G!?!_!A(B")
-			 ("-" "$(0!7!9"#"$"1"@(B" "$(G!7!9"#"$"1"@(B")
-			 ("_" "$(0"%"&(B" "$(G"%"&(B")
-			 ("=" "$(0"8"C(B" "$(G"8"C(B")
-			 ("+" "$(0"0"?(B" "$(G"0"?(B"))))
+    (let ((punctuation '((";" "；﹔，、﹐﹑" "；﹔，、﹐﹑")
+			 (":" "：︰﹕．。‧﹒·" "：︰﹕．。・﹒·")
+			 ("'" "’‘" "’‘")
+			 ("\"" "”“〝〞〃" "”“〝〞〃")
+			 ("\\" "＼﹨╲" "＼﹨╲")
+			 ("|" "｜︱︳∣" "︱︲����｜")
+			 ("/" "／∕╱" "／∕╱")
+			 ("?" "？﹖" "？﹖")
+			 ("<" "〈＜﹤︿∠" "〈＜﹤︿∠")
+			 (">" "〉＞﹥﹀" "〉＞﹦﹀")
+			 ("[" "〔【﹝︹︻「『﹁﹃" "〔【﹝︹︻「『﹁﹃")
+			 ("]" "〕】﹞︺︼」』﹂﹄" "〕】﹞︺︼」』﹂﹄")
+			 ("{" "｛﹛︷ " "｛﹛︷ ")
+			 ("}" "｝﹜︸" "｝﹜︸")
+			 ("`" "‵′" "′‵")
+			 ("~" "～﹋﹌︴﹏" "∼﹋﹌��������")
+			 ("!" "！﹗" "！﹗")
+			 ("@" "＠﹫" "＠﹫")
+			 ("#" "＃﹟" "＃﹟")
+			 ("$" "＄﹩" "＄﹩")
+			 ("%" "％﹪" "％﹪")
+			 ("&" "＆﹠" "＆﹠")
+			 ("*" "＊﹡※☆★" "＊﹡※☆★")
+			 ("(" "（﹙︵" "（﹙︵")
+			 (")" "）﹚︶" "）﹚︶")
+			 ("-" "–—¯￣－﹣" "—–‾����－﹣")
+			 ("_" "＿ˍ" "＿����")
+			 ("=" "＝﹦" "＝﹥")
+			 ("+" "＋﹢" "＋﹢"))))
     (dolist (elt punctuation)
       (insert (format "(%S %S)\n" (concat "z" (car elt))
 		      (if big5-p (nth 1 elt) (nth 2 elt))))))
@@ -849,11 +849,11 @@ To get complete usage, invoke \"emacs -batch -f batch-titdic-convert -h\"."
 
 (defun py-converter (dicbuf name title)
   (goto-char (point-max))
-  (insert (format "%S\n" "$A::WVJdHk!KF4Rt!K(B
+  (insert (format "%S\n" "汉字输入∷拼音∷
 
-	$AF4Rt7=08(B
+	拼音方案
 
- $AP!P4S"NDWVD84z1m!8F4Rt!97{:E#,(B \"u(yu) $ATrSC(B u: $A1mJ>!C(B
+ 小写英文字母代表「拼音」符号， \"u(yu) 则用 u: 表示∶
 
 Pinyin base input method for Chinese charset GB2312 (`chinese-gb2312').
 
@@ -867,14 +867,14 @@ character.  The sequence is made by the combination of the initials
           iang ing iong u ua uo uai ui uan un uan ueng yu yue yuan yun
 
   (Note: In the correct Pinyin writing, the sequence \"yu\" in the last
-   four finals should be written by the character u-umlaut `$A(9(B'.)
+   four finals should be written by the character u-umlaut `ü'.)
 
 With this input method, you enter a Chinese character by first
 entering its pinyin spelling.
 
 \\<quail-translation-docstring>
 
-For instance, to input $ADc(B, you type \"n i C-n 3\".  The first \"n i\"
+For instance, to input 你, you type \"n i C-n 3\".  The first \"n i\"
 is a Pinyin, \"C-n\" selects the next group of candidates (each group
 contains at most 10 characters), \"3\" select the third character in
 that group.
@@ -957,22 +957,22 @@ method `chinese-tonepy' with which you must specify tones by digits
 		 table)))
     (setq dic (sort dic (function (lambda (x y) (string< (car x) (car y))))))
     (goto-char (point-max))
-    (insert (format "%S\n" "$A::WVJdHk!K!>WTH;!?!K(B
-
-                            $A<|EL6TUU1m(B:
- $A)3)%)%)W)%)%)W)%)%)W)%)%)W)%)%)W)%)%)W)%)%)W)%)%)W)%)%)W)%)%)7(B
- $A)'#Q(B  $A)'#W(B  $A)'#E(B  $A)'#R(B  $A)'#T(B  $A)'#Y(B  $A)'#U(Bsh$A)'#I(Bch$A)'#O(B  $A)'#P(B  $A)'(B
- $A)'(B  iu$A)'(B  ua$A)'(B   e$A)'(B uan$A)'(B  ue$A)'(B uai$A)'(B   u$A)'(B   i$A)'(B   o$A)'(B  un$A)'(B
- $A)'(B    $A)'(B  ia$A)'(B    $A)'(B van$A)'(B  ve$A)'(B ing$A)'(B    $A)'(B    $A)'(B  uo$A)'(B  vn$A)'(B
- $A);)W)%)_)W)%)_)W)%)_)W)%)_)W)%)_)W)%)_)W)%)_)W)%)_)W)%)_)W)%)?(B
-   $A)'#A(B  $A)'#S(B  $A)'#D(B  $A)'#F(B  $A)'#G(B  $A)'#H(B  $A)'#J(B  $A)'#K(B  $A)'#L(B  $A)'(B
-   $A)'(B   a$A)'(Biong$A)'(Buang$A)'(B  en$A)'(B eng$A)'(B ang$A)'(B  an$A)'(B  ao$A)'(B  ai$A)'(B
-   $A)'(B    $A)'(B ong$A)'(Biang$A)'(B    $A)'(B  ng$A)'(B    $A)'(B    $A)'(B    $A)'(B    $A)'(B
-   $A);)W)%)_)W)%)_)W)%)_)W)%)_)W)%)_)W)%)_)W)%)_)W)%)_)W)%)_)W)%)%)7(B
-     $A)'#Z(B  $A)'#X(B  $A)'#C(B  $A)'#V(Bzh$A)'#B(B  $A)'#N(B  $A)'#M(B  $A)'#,(B  $A)'#.(B  $A)'(B $A#/(B $A)'(B
-     $A)'(B  ei$A)'(B  ie$A)'(B iao$A)'(B  ui$A)'(B  ou$A)'(B  in$A)'(B ian$A)'G0R3)':sR3)'7{:E)'(B
-     $A)'(B    $A)'(B    $A)'(B    $A)'(B   v$A)'(B    $A)'(B    $A)'(B    $A)'(B    $A)'(B    $A)'(B    $A)'(B
-     $A);)%)%)_)%)%)_)%)%)_)%)%)_)%)%)_)%)%)_)%)%)_)%)%)_)%)%)_)%)%)?(B
+    (insert (format "%S\n" "汉字输入∷【自然】∷
+
+                            键盘对照表:
+ ┏━━┳━━┳━━┳━━┳━━┳━━┳━━┳━━┳━━┳━━┓
+ ┃Ｑ  ┃Ｗ  ┃Ｅ  ┃Ｒ  ┃Ｔ  ┃Ｙ  ┃Ｕsh┃Ｉch┃Ｏ  ┃Ｐ  ┃
+ ┃  iu┃  ua┃   e┃ uan┃  ue┃ uai┃   u┃   i┃   o┃  un┃
+ ┃    ┃  ia┃    ┃ van┃  ve┃ ing┃    ┃    ┃  uo┃  vn┃
+ ┗┳━┻┳━┻┳━┻┳━┻┳━┻┳━┻┳━┻┳━┻┳━┻┳━┛
+   ┃Ａ  ┃Ｓ  ┃Ｄ  ┃Ｆ  ┃Ｇ  ┃Ｈ  ┃Ｊ  ┃Ｋ  ┃Ｌ  ┃
+   ┃   a┃iong┃uang┃  en┃ eng┃ ang┃  an┃  ao┃  ai┃
+   ┃    ┃ ong┃iang┃    ┃  ng┃    ┃    ┃    ┃    ┃
+   ┗┳━┻┳━┻┳━┻┳━┻┳━┻┳━┻┳━┻┳━┻┳━┻┳━━┓
+     ┃Ｚ  ┃Ｘ  ┃Ｃ  ┃Ｖzh┃Ｂ  ┃Ｎ  ┃Ｍ  ┃，  ┃．  ┃ ／ ┃
+     ┃  ei┃  ie┃ iao┃  ui┃  ou┃  in┃ ian┃前页┃后页┃符号┃
+     ┃    ┃    ┃    ┃   v┃    ┃    ┃    ┃    ┃    ┃    ┃
+     ┗━━┻━━┻━━┻━━┻━━┻━━┻━━┻━━┻━━┻━━┛
 
 
 Pinyin base input method for Chinese GB2312 characters (`chinese-gb2312').
@@ -984,34 +984,34 @@ method `chinese-py'.
 Unlike the standard spelling of Pinyin, in this input method all
 initials and finals are assigned to single keys (see the above table).
 For instance, the initial \"ch\" is assigned to the key `i', the final
-\"iu\" is assigned to the key `q', and tones 1, 2, 3, 4, and $AGaIy(B are
+\"iu\" is assigned to the key `q', and tones 1, 2, 3, 4, and 轻声 are
 assigned to the keys `q', `w', `e', `r', `t' respectively.
 
 \\<quail-translation-docstring>
 
 To input one-letter words, you type 4 keys, the first two for the
 Pinyin of the letter, next one for tone, and the last one is always a
-quote (').  For instance, \"vsq'\" input $AVP(B.  Exceptions are these
+quote (').  For instance, \"vsq'\" input 中.  Exceptions are these
 letters.  You can input them just by typing a single key.
 
-	Character: $A04(B $A2;(B $A4N(B $A5D(B $A6~(B $A7"(B $A8v(B $A:M(B $A3v(B $A<0(B $A?I(B $AAK(B $AC;(B
+	Character: 按 不 次 的 二 发 个 和 出 及 可 了 没
 	Key:	   a  b  c  d  e  f  g  h  i  j  k  l  m
-	Character: $ADc(B $AE7(B $AF,(B $AF_(B $AHK(B $AH}(B $AK{(B $AJG(B $AWE(B $ANR(B $AP!(B $AR;(B $ATZ(B
+	Character: 你 欧 片 七 人 三 他 是 着 我 小 一 在
 	Key:	   n  o  p  q  r  s  t  u  v  w  x  y  z
 
 To input two-letter words, you have two ways.  One way is to type 4
 keys, two for the first Pinyin, two for the second Pinyin.  For
-instance, \"vsgo\" inputs $AVP9z(B.  Another way is to type 3 keys: 2
+instance, \"vsgo\" inputs 中国.  Another way is to type 3 keys: 2
 initials of two letters, and quote (').  For instance, \"vg'\" also
-inputs $AVP9z(B.
+inputs 中国.
 
 To input three-letter words, you type 4 keys: initials of three
-letters, and the last is quote (').  For instance, \"bjy'2\" inputs $A11(B
-$A>)Q<(B (the last `2' is to select one of the candidates).
+letters, and the last is quote (').  For instance, \"bjy'2\" inputs 北
+京鸭 (the last `2' is to select one of the candidates).
 
 To input words of more than three letters, you type 4 keys, initials
 of the first three letters and the last letter.  For instance,
-\"bjdt\" inputs $A11>)5gJSL((B.
+\"bjdt\" inputs 北京电视台.
 
 To input symbols and punctuation, type `/' followed by one of `a' to
 `z', then select one of the candidates."))
@@ -1058,7 +1058,7 @@ To input symbols and punctuation, type `/' followed by one of `a' to
     ;; which the file is converted have no Big5 equivalent.  Go
     ;; through and delete them.
     (goto-char pos)
-    (while (search-forward "$(0!{(B" nil t)
+    (while (search-forward "□" nil t)
       (delete-char -1))
     ;; Uppercase keys in dictionary need to be downcased.  Backslashes
     ;; at the beginning of keys need to be turned into double
@@ -1082,31 +1082,31 @@ To input symbols and punctuation, type `/' followed by one of `a' to
 
 (defun ctlau-gb-converter (dicbuf name title)
   (ctlau-converter dicbuf name title
-"$A::WVJdHk!KAuN}OiJ=TARt!K(B
+"汉字输入∷刘锡祥式粤音∷
 
- $AAuN}OiJ=TASoW"Rt7=08(B
+ 刘锡祥式粤语注音方案
  Sidney Lau's Cantonese transcription scheme as described in his book
  \"Elementary Cantonese\", The Government Printer, Hong Kong, 1972.
- This file was prepared by Fung Fung Lee ($A@n7c7e(B).
+ This file was prepared by Fung Fung Lee (李枫峰).
  Originally converted from CTCPS3.tit
  Last modified: June 2, 1993.
 
  Some infrequent GB characters are accessed by typing \\, followed by
- the Cantonese romanization of the respective radical ($A2?JW(B)."))
+ the Cantonese romanization of the respective radical (部首)."))
 
 (defun ctlau-b5-converter (dicbuf name title)
   (ctlau-converter dicbuf name title
-"$(0KH)tTT&,!(N,Tg>A*#Gn5x!((B
+"漢字輸入：劉錫祥式粵音：
 
- $(0N,Tg>A*#GnM$0D5x'J7{(B
+ 劉錫祥式粵語注音方案
  Sidney Lau's Cantonese transcription scheme as described in his book
  \"Elementary Cantonese\", The Government Printer, Hong Kong, 1972.
- This file was prepared by Fung Fung Lee ($(0,XFS76(B).
+ This file was prepared by Fung Fung Lee (李楓峰).
  Originally converted from CTCPS3.tit
  Last modified: June 2, 1993.
 
  Some infrequent characters are accessed by typing \\, followed by
- the Cantonese romanization of the respective radical ($(0?f5}(B)."))
+ the Cantonese romanization of the respective radical (部首)."))
 
 (declare-function dos-8+3-filename "dos-fns.el" (filename))
 
diff --git a/lisp/language/japan-util.el b/lisp/language/japan-util.el
index fd27ae220b..5d6f537407 100644
--- a/lisp/language/japan-util.el
+++ b/lisp/language/japan-util.el
@@ -1,4 +1,4 @@
-;;; japan-util.el --- utilities for Japanese -*- coding: iso-2022-7bit; -*-
+;;; japan-util.el --- utilities for Japanese
 
 ;; Copyright (C) 2001-2019 Free Software Foundation, Inc.
 ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
@@ -37,28 +37,28 @@
   (use-cjk-char-width-table 'ja_JP))
 
 (defconst japanese-kana-table
-  '((?$B$"(B ?$B%"(B ?(I1(B) (?$B$$(B ?$B%$(B ?(I2(B) (?$B$&(B ?$B%&(B ?(I3(B) (?$B$((B ?$B%((B ?(I4(B) (?$B$*(B ?$B%*(B ?(I5(B)
-    (?$B$+(B ?$B%+(B ?(I6(B) (?$B$-(B ?$B%-(B ?(I7(B) (?$B$/(B ?$B%/(B ?(I8(B) (?$B$1(B ?$B%1(B ?(I9(B) (?$B$3(B ?$B%3(B ?(I:(B)
-    (?$B$5(B ?$B%5(B ?(I;(B) (?$B$7(B ?$B%7(B ?(I<(B) (?$B$9(B ?$B%9(B ?(I=(B) (?$B$;(B ?$B%;(B ?(I>(B) (?$B$=(B ?$B%=(B ?(I?(B)
-    (?$B$?(B ?$B%?(B ?(I@(B) (?$B$A(B ?$B%A(B ?(IA(B) (?$B$D(B ?$B%D(B ?(IB(B) (?$B$F(B ?$B%F(B ?(IC(B) (?$B$H(B ?$B%H(B ?(ID(B)
-    (?$B$J(B ?$B%J(B ?(IE(B) (?$B$K(B ?$B%K(B ?(IF(B) (?$B$L(B ?$B%L(B ?(IG(B) (?$B$M(B ?$B%M(B ?(IH(B) (?$B$N(B ?$B%N(B ?(II(B)
-    (?$B$O(B ?$B%O(B ?(IJ(B) (?$B$R(B ?$B%R(B ?(IK(B) (?$B$U(B ?$B%U(B ?(IL(B) (?$B$X(B ?$B%X(B ?(IM(B) (?$B$[(B ?$B%[(B ?(IN(B)
-    (?$B$^(B ?$B%^(B ?(IO(B) (?$B$_(B ?$B%_(B ?(IP(B) (?$B$`(B ?$B%`(B ?(IQ(B) (?$B$a(B ?$B%a(B ?(IR(B) (?$B$b(B ?$B%b(B ?(IS(B)
-    (?$B$d(B ?$B%d(B ?(IT(B) (?$B$f(B ?$B%f(B ?(IU(B) (?$B$h(B ?$B%h(B ?(IV(B)
-    (?$B$i(B ?$B%i(B ?(IW(B) (?$B$j(B ?$B%j(B ?(IX(B) (?$B$k(B ?$B%k(B ?(IY(B) (?$B$l(B ?$B%l(B ?(IZ(B) (?$B$m(B ?$B%m(B ?(I[(B)
-    (?$B$o(B ?$B%o(B ?(I\(B) (?$B$p(B ?$B%p(B "(I2(B") (?$B$q(B ?$B%q(B "(I4(B") (?$B$r(B ?$B%r(B ?(I&(B)
-    (?$B$s(B ?$B%s(B ?(I](B)
-    (?$B$,(B ?$B%,(B "(I6^(B") (?$B$.(B ?$B%.(B "(I7^(B") (?$B$0(B ?$B%0(B "(I8^(B") (?$B$2(B ?$B%2(B "(I9^(B") (?$B$4(B ?$B%4(B "(I:^(B")
-    (?$B$6(B ?$B%6(B "(I;^(B") (?$B$8(B ?$B%8(B "(I<^(B") (?$B$:(B ?$B%:(B "(I=^(B") (?$B$<(B ?$B%<(B "(I>^(B") (?$B$>(B ?$B%>(B "(I?^(B")
-    (?$B$@(B ?$B%@(B "(I@^(B") (?$B$B(B ?$B%B(B "(IA^(B") (?$B$E(B ?$B%E(B "(IB^(B") (?$B$G(B ?$B%G(B "(IC^(B") (?$B$I(B ?$B%I(B "(ID^(B")
-    (?$B$P(B ?$B%P(B "(IJ^(B") (?$B$S(B ?$B%S(B "(IK^(B") (?$B$V(B ?$B%V(B "(IL^(B") (?$B$Y(B ?$B%Y(B "(IM^(B") (?$B$\(B ?$B%\(B "(IN^(B")
-    (?$B$Q(B ?$B%Q(B "(IJ_(B") (?$B$T(B ?$B%T(B "(IK_(B") (?$B$W(B ?$B%W(B "(IL_(B") (?$B$Z(B ?$B%Z(B "(IM_(B") (?$B$](B ?$B%](B "(IN_(B")
-    (?$B$!(B ?$B%!(B ?(I'(B) (?$B$#(B ?$B%#(B ?(I((B) (?$B$%(B ?$B%%(B ?(I)(B) (?$B$'(B ?$B%'(B ?(I*(B) (?$B$)(B ?$B%)(B ?(I+(B)
-    (?$B$C(B ?$B%C(B ?(I/(B)
-    (?$B$c(B ?$B%c(B ?(I,(B) (?$B$e(B ?$B%e(B ?(I-(B) (?$B$g(B ?$B%g(B ?(I.(B)
-    (?$B$n(B ?$B%n(B "(I\(B")
-    (?$B!5(B ?$B!3(B) (?$B!6(B ?$B!4(B)
-    ("$B$&!+(B" ?$B%t(B "(I3^(B") (nil ?$B%u(B "(I6(B") (nil ?$B%v(B "(I9(B"))
+  '((?あ ?ア ?ｱ) (?い ?イ ?ｲ) (?う ?ウ ?ｳ) (?え ?エ ?ｴ) (?お ?オ ?ｵ)
+    (?か ?カ ?ｶ) (?き ?キ ?ｷ) (?く ?ク ?ｸ) (?け ?ケ ?ｹ) (?こ ?コ ?ｺ)
+    (?さ ?サ ?ｻ) (?し ?シ ?ｼ) (?す ?ス ?ｽ) (?せ ?セ ?ｾ) (?そ ?ソ ?ｿ)
+    (?た ?タ ?ﾀ) (?ち ?チ ?ﾁ) (?つ ?ツ ?ﾂ) (?て ?テ ?ﾃ) (?と ?ト ?ﾄ)
+    (?な ?ナ ?ﾅ) (?に ?ニ ?ﾆ) (?ぬ ?ヌ ?ﾇ) (?ね ?ネ ?ﾈ) (?の ?ノ ?ﾉ)
+    (?は ?ハ ?ﾊ) (?ひ ?ヒ ?ﾋ) (?ふ ?フ ?ﾌ) (?へ ?ヘ ?ﾍ) (?ほ ?ホ ?ﾎ)
+    (?ま ?マ ?ﾏ) (?み ?ミ ?ﾐ) (?む ?ム ?ﾑ) (?め ?メ ?ﾒ) (?も ?モ ?ﾓ)
+    (?や ?ヤ ?ﾔ) (?ゆ ?ユ ?ﾕ) (?よ ?ヨ ?ﾖ)
+    (?ら ?ラ ?ﾗ) (?り ?リ ?ﾘ) (?る ?ル ?ﾙ) (?れ ?レ ?ﾚ) (?ろ ?ロ ?ﾛ)
+    (?わ ?ワ ?ﾜ) (?ゐ ?ヰ "ｲ") (?ゑ ?ヱ "ｴ") (?を ?ヲ ?ｦ)
+    (?ん ?ン ?ﾝ)
+    (?が ?ガ "ｶﾞ") (?ぎ ?ギ "ｷﾞ") (?ぐ ?グ "ｸﾞ") (?げ ?ゲ "ｹﾞ") (?ご ?ゴ "ｺﾞ")
+    (?ざ ?ザ "ｻﾞ") (?じ ?ジ "ｼﾞ") (?ず ?ズ "ｽﾞ") (?ぜ ?ゼ "ｾﾞ") (?ぞ ?ゾ "ｿﾞ")
+    (?だ ?ダ "ﾀﾞ") (?ぢ ?ヂ "ﾁﾞ") (?づ ?ヅ "ﾂﾞ") (?で ?デ "ﾃﾞ") (?ど ?ド "ﾄﾞ")
+    (?ば ?バ "ﾊﾞ") (?び ?ビ "ﾋﾞ") (?ぶ ?ブ "ﾌﾞ") (?べ ?ベ "ﾍﾞ") (?ぼ ?ボ "ﾎﾞ")
+    (?ぱ ?パ "ﾊﾟ") (?ぴ ?ピ "ﾋﾟ") (?ぷ ?プ "ﾌﾟ") (?ぺ ?ペ "ﾍﾟ") (?ぽ ?ポ "ﾎﾟ")
+    (?ぁ ?ァ ?ｧ) (?ぃ ?ィ ?ｨ) (?ぅ ?ゥ ?ｩ) (?ぇ ?ェ ?ｪ) (?ぉ ?ォ ?ｫ)
+    (?っ ?ッ ?ｯ)
+    (?ゃ ?ャ ?ｬ) (?ゅ ?ュ ?ｭ) (?ょ ?ョ ?ｮ)
+    (?ゎ ?ヮ "ﾜ")
+    (?ゝ ?ヽ) (?ゞ ?ヾ)
+    ("う゛" ?ヴ "ｳﾞ") (nil ?ヵ "ｶ") (nil ?ヶ "ｹ"))
   "Japanese JISX0208 Kana character table.
 Each element is of the form (HIRAGANA KATAKANA HANKAKU-KATAKANA), where
 HIRAGANA and KATAKANA belong to `japanese-jisx0208',
@@ -98,15 +98,15 @@ HANKAKU-KATAKANA belongs to `japanese-jisx0201-kana'.")
 	  (put-char-code-property jisx0201 'jisx0208 katakana)))))
 
 (defconst japanese-symbol-table
-  '((?\$B!!(B ?\ ) (?$B!$(B ?, ?(I$(B) (?$B!%(B ?. ?(I!(B) (?$B!"(B ?, ?(I$(B) (?$B!#(B ?. ?(I!(B) (?$B!&(B nil ?(I%(B)
-    (?$B!'(B ?:) (?$B!((B ?\;) (?$B!)(B ??) (?$B!*(B ?!) (?$B!+(B nil ?(I^(B) (?$B!,(B nil ?(I_(B)
-    (?$B!-(B ?') (?$B!.(B ?`) (?$B!0(B ?^) (?$B!2(B ?_) (?$B!<(B ?- ?(I0(B) (?$B!=(B ?-) (?$B!>(B ?-)
-    (?$B!?(B ?/) (?$B!@(B ?\\) (?$B!A(B ?~)  (?$B!C(B ?|) (?$B!F(B ?`) (?$B!G(B ?') (?$B!H(B ?\") (?$B!I(B ?\")
-    (?\$B!J(B ?\() (?\$B!K(B ?\)) (?\$B!N(B ?\[) (?\$B!O(B ?\]) (?\$B!P(B ?{) (?\$B!Q(B ?})
-    (?$B!R(B ?<) (?$B!S(B ?>) (?\$B!V(B nil ?\(I"(B) (?\$B!W(B nil ?\(I#(B)
-    (?$B!\(B ?+) (?$B!](B ?-) (?$B!a(B ?=) (?$B!c(B ?<) (?$B!d(B ?>)
-    (?$B!l(B ?') (?$B!m(B ?\") (?$B!o(B ?\\) (?$B!p(B ?$) (?$B!s(B ?%) (?$B!t(B ?#) (?$B!u(B ?&) (?$B!v(B ?*)
-    (?$B!w(B ?@)
+  '((?\　 ?\ ) (?， ?, ?､) (?． ?. ?｡) (?、 ?, ?､) (?。 ?. ?｡) (?・ nil ?･)
+    (?： ?:) (?； ?\;) (?？ ??) (?！ ?!) (?゛ nil ?ﾞ) (?゜ nil ?ﾟ)
+    (?´ ?') (?｀ ?`) (?＾ ?^) (?＿ ?_) (?ー ?- ?ｰ) (?— ?-) (?‐ ?-)
+    (?／ ?/) (?＼ ?\\) (?〜 ?~)  (?｜ ?|) (?‘ ?`) (?’ ?') (?“ ?\") (?” ?\")
+    (?\（ ?\() (?\） ?\)) (?\［ ?\[) (?\］ ?\]) (?\｛ ?{) (?\｝ ?})
+    (?〈 ?<) (?〉 ?>) (?\「 nil ?\｢) (?\」 nil ?\｣)
+    (?＋ ?+) (?− ?-) (?＝ ?=) (?＜ ?<) (?＞ ?>)
+    (?′ ?') (?″ ?\") (?￥ ?\\) (?＄ ?$) (?％ ?%) (?＃ ?#) (?＆ ?&) (?＊ ?*)
+    (?＠ ?@)
     ;; cp932-2-byte
     (#x2015 ?-) (#xFF5E ?~) (#xFF0D ?-))
   "Japanese JISX0208 and CP932 symbol character table.
@@ -134,18 +134,18 @@ and HANKAKU belongs to `japanese-jisx0201-kana'.")
 	      (put-char-code-property jisx0201 'jisx0208 jisx0208))))))
 
 (defconst japanese-alpha-numeric-table
-  '((?$B#0(B . ?0) (?$B#1(B . ?1) (?$B#2(B . ?2) (?$B#3(B . ?3) (?$B#4(B . ?4)
-    (?$B#5(B . ?5) (?$B#6(B . ?6) (?$B#7(B . ?7) (?$B#8(B . ?8) (?$B#9(B . ?9)
-    (?$B#A(B . ?A) (?$B#B(B . ?B) (?$B#C(B . ?C) (?$B#D(B . ?D) (?$B#E(B . ?E)
-    (?$B#F(B . ?F) (?$B#G(B . ?G) (?$B#H(B . ?H) (?$B#I(B . ?I) (?$B#J(B . ?J)
-    (?$B#K(B . ?K) (?$B#L(B . ?L) (?$B#M(B . ?M) (?$B#N(B . ?N) (?$B#O(B . ?O)
-    (?$B#P(B . ?P) (?$B#Q(B . ?Q) (?$B#R(B . ?R) (?$B#S(B . ?S) (?$B#T(B . ?T)
-    (?$B#U(B . ?U) (?$B#V(B . ?V) (?$B#W(B . ?W) (?$B#X(B . ?X) (?$B#Y(B . ?Y) (?$B#Z(B . ?Z)
-    (?$B#a(B . ?a) (?$B#b(B . ?b) (?$B#c(B . ?c) (?$B#d(B . ?d) (?$B#e(B . ?e)
-    (?$B#f(B . ?f) (?$B#g(B . ?g) (?$B#h(B . ?h) (?$B#i(B . ?i) (?$B#j(B . ?j)
-    (?$B#k(B . ?k) (?$B#l(B . ?l) (?$B#m(B . ?m) (?$B#n(B . ?n) (?$B#o(B . ?o)
-    (?$B#p(B . ?p) (?$B#q(B . ?q) (?$B#r(B . ?r) (?$B#s(B . ?s) (?$B#t(B . ?t)
-    (?$B#u(B . ?u) (?$B#v(B . ?v) (?$B#w(B . ?w) (?$B#x(B . ?x) (?$B#y(B . ?y) (?$B#z(B . ?z))
+  '((?０ . ?0) (?１ . ?1) (?２ . ?2) (?３ . ?3) (?４ . ?4)
+    (?５ . ?5) (?６ . ?6) (?７ . ?7) (?８ . ?8) (?９ . ?9)
+    (?Ａ . ?A) (?Ｂ . ?B) (?Ｃ . ?C) (?Ｄ . ?D) (?Ｅ . ?E)
+    (?Ｆ . ?F) (?Ｇ . ?G) (?Ｈ . ?H) (?Ｉ . ?I) (?Ｊ . ?J)
+    (?Ｋ . ?K) (?Ｌ . ?L) (?Ｍ . ?M) (?Ｎ . ?N) (?Ｏ . ?O)
+    (?Ｐ . ?P) (?Ｑ . ?Q) (?Ｒ . ?R) (?Ｓ . ?S) (?Ｔ . ?T)
+    (?Ｕ . ?U) (?Ｖ . ?V) (?Ｗ . ?W) (?Ｘ . ?X) (?Ｙ . ?Y) (?Ｚ . ?Z)
+    (?ａ . ?a) (?ｂ . ?b) (?ｃ . ?c) (?ｄ . ?d) (?ｅ . ?e)
+    (?ｆ . ?f) (?ｇ . ?g) (?ｈ . ?h) (?ｉ . ?i) (?ｊ . ?j)
+    (?ｋ . ?k) (?ｌ . ?l) (?ｍ . ?m) (?ｎ . ?n) (?ｏ . ?o)
+    (?ｐ . ?p) (?ｑ . ?q) (?ｒ . ?r) (?ｓ . ?s) (?ｔ . ?t)
+    (?ｕ . ?u) (?ｖ . ?v) (?ｗ . ?w) (?ｘ . ?x) (?ｙ . ?y) (?ｚ . ?z))
   "Japanese JISX0208 alpha numeric character table.
 Each element is of the form (ALPHA-NUMERIC . ASCII), where ALPHA-NUMERIC
 belongs to `japanese-jisx0208', ASCII belongs to `ascii'.")
diff --git a/lisp/language/japanese.el b/lisp/language/japanese.el
index 9c41a26f36..fabeab89c1 100644
--- a/lisp/language/japanese.el
+++ b/lisp/language/japanese.el
@@ -1,4 +1,4 @@
-;;; japanese.el --- support for Japanese -*- coding: iso-2022-7bit -*-
+;;; japanese.el --- support for Japanese
 
 ;; Copyright (C) 1997, 2001-2019 Free Software Foundation, Inc.
 ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
@@ -210,7 +210,7 @@ eucJP-ms is defined in <http://www.opengroup.or.jp/jvc/cde/appendix.html>."
                                iso-2022-jp-2)
 	      (input-method . "japanese")
 	      (features japan-util)
-	      (sample-text . "Japanese ($BF|K\8l(B)	$B$3$s$K$A$O(B, (I:]FAJ(B")
+	      (sample-text . "Japanese (日本語)	こんにちは, ｺﾝﾆﾁﾊ")
 	      (documentation . t)))
 
 (let ((map
diff --git a/lisp/leim/quail/cyril-jis.el b/lisp/leim/quail/cyril-jis.el
index 0214a51d74..67271ab3c4 100644
--- a/lisp/leim/quail/cyril-jis.el
+++ b/lisp/leim/quail/cyril-jis.el
@@ -32,114 +32,110 @@
 ;;; Code:
 
 (quail-define-package
- "cyrillic-jis-russian" "Cyrillic" "$B'('+(B" nil
- "$B'+'8'5','&'/(B keyboard layout same as JCUKEN (JIS X0208.1983 encoding)"
+ "cyrillic-jis-russian" "Cyrillic" "ЖЙ" nil
+ "ЙЦУКЕН keyboard layout same as JCUKEN (JIS X0208.1983 encoding)"
  nil t t t t nil nil nil nil nil t)
 
-;;  1! 2@ 3# 4" 5: 6, 7. 8* 9( 0) -_ =+ ,L!(B
-;;   ,L9(B  ,LF(B  ,LC(B  ,L:(B  ,L5(B  ,L=(B  ,L3(B  ,LH(B  ,LI(B  ,L7(B  ,LE(B  ,Lj(B
-;;    ,LD(B  ,LK(B  ,L2(B  ,L0(B  ,L?(B  ,L@(B  ,L>(B  ,L;(B  ,L4(B  ,L6(B  ,LM(B
-;;     ,LO(B  ,LG(B  ,LA(B  ,L<(B  ,L8(B  ,LB(B  ,LL(B  ,L1(B  ,LN(B  /?
+;;  1! 2@ 3# 4" 5: 6, 7. 8* 9( 0) -_ =+ Ё
+;;   Й  Ц  У  К  Е  Н  Г  Ш  Щ  З  Х  ъ
+;;    Ф  Ы  В  А  П  Р  О  Л  Д  Ж  Э
+;;     Я  Ч  С  М  И  Т  Ь  Б  Ю  /?
 
 (quail-define-rules
- ("1" ?$B#1(B)
- ("2" ?$B#2(B)
- ("3" ?$B#3(B)
- ("4" ?$B#4(B)
- ("5" ?$B#5(B)
- ("6" ?$B#6(B)
- ("7" ?$B#7(B)
- ("8" ?$B#8(B)
- ("9" ?$B#9(B)
- ("0" ?$B#0(B)
- ("-" ?$B!](B)
- ("=" ?$B!a(B)
- ("`" ?$B'W(B)
- ("q" ?$B'[(B)
- ("w" ?$B'h(B)
- ("e" ?$B'e(B)
- ("r" ?$B'\(B)
- ("t" ?$B'V(B)
- ("y" ?$B'_(B)
- ("u" ?$B'T(B)
- ("i" ?$B'j(B)
- ("o" ?$B'k(B)
- ("p" ?$B'Y(B)
- ("[" ?$B'g(B)
- ("]" ?$B'l(B)
- ("a" ?$B'f(B)
- ("s" ?$B'm(B)
- ("d" ?$B'S(B)
- ("f" ?$B'Q(B)
- ("g" ?$B'a(B)
- ("h" ?$B'b(B)
- ("j" ?$B'`(B)
- ("k" ?$B'](B)
- ("l" ?$B'U(B)
- (";" ?$B'X(B)
- ("'" ?$B'o(B)
- ("\\" ?$B!@(B)
- ("z" ?$B'q(B)
- ("x" ?$B'i(B)
- ("c" ?$B'c(B)
- ("v" ?$B'^(B)
- ("b" ?$B'Z(B)
- ("n" ?$B'd(B)
- ("m" ?$B'n(B)
- ("," ?$B'R(B)
- ("." ?$B'p(B)
- ("/" ?$B!?(B)
+ ("1" ?１)
+ ("2" ?２)
+ ("3" ?３)
+ ("4" ?４)
+ ("5" ?５)
+ ("6" ?６)
+ ("7" ?７)
+ ("8" ?８)
+ ("9" ?９)
+ ("0" ?０)
+ ("-" ?−)
+ ("=" ?＝)
+ ("`" ?ё)
+ ("q" ?й)
+ ("w" ?ц)
+ ("e" ?у)
+ ("r" ?к)
+ ("t" ?е)
+ ("y" ?н)
+ ("u" ?г)
+ ("i" ?ш)
+ ("o" ?щ)
+ ("p" ?з)
+ ("[" ?х)
+ ("]" ?ъ)
+ ("a" ?ф)
+ ("s" ?ы)
+ ("d" ?в)
+ ("f" ?а)
+ ("g" ?п)
+ ("h" ?р)
+ ("j" ?о)
+ ("k" ?л)
+ ("l" ?д)
+ (";" ?ж)
+ ("'" ?э)
+ ("\\" ?＼)
+ ("z" ?я)
+ ("x" ?ч)
+ ("c" ?с)
+ ("v" ?м)
+ ("b" ?и)
+ ("n" ?т)
+ ("m" ?ь)
+ ("," ?б)
+ ("." ?ю)
+ ("/" ?／)
 
- ("!" ?$B!*(B)
- ("@" ?$B!w(B)
- ("#" ?$B!t(B)
- ("$" ?$B!I(B)
- ("%" ?$B!'(B)
- ("^" ?$B!$(B)
- ("&" ?$B!%(B)
- ("*" ?$B!v(B)
- ("(" ?$B!J(B)
-  (")" ?$B!K(B)
- ("_" ?$B!2(B)
- ("+" ?$B!\(B)
- ("~" ?$B''(B)
- ("Q" ?$B'+(B)
- ("W" ?$B'8(B)
- ("E" ?$B'5(B)
- ("R" ?$B',(B)
- ("T" ?$B'&(B)
- ("Y" ?$B'/(B)
- ("U" ?$B'$(B)
- ("I" ?$B':(B)
- ("O" ?$B';(B)
- ("P" ?$B')(B)
- ("{" ?$B'7(B)
- ("}" ?$B'<(B)
- ("A" ?$B'6(B)
- ("S" ?$B'=(B)
- ("D" ?$B'#(B)
- ("F" ?$B'!(B)
- ("G" ?$B'1(B)
- ("H" ?$B'2(B)
- ("J" ?$B'0(B)
- ("K" ?$B'-(B)
- ("L" ?$B'%(B)
- (":" ?$B'((B)
- ("\"" ?$B'?(B)
- ("|" ?$B!C(B)
- ("Z" ?$B'A(B)
- ("X" ?$B'9(B)
- ("C" ?$B'3(B)
- ("V" ?$B'.(B)
- ("B" ?$B'*(B)
- ("N" ?$B'4(B)
- ("M" ?$B'>(B)
- ("<" ?$B'"(B)
- (">" ?$B'@(B)
- ("?" ?$B!)(B))
-
-;; Local Variables:
-;; coding: iso-2022-7bit
-;; End:
+ ("!" ?！)
+ ("@" ?＠)
+ ("#" ?＃)
+ ("$" ?”)
+ ("%" ?：)
+ ("^" ?，)
+ ("&" ?．)
+ ("*" ?＊)
+ ("(" ?（)
+  (")" ?）)
+ ("_" ?＿)
+ ("+" ?＋)
+ ("~" ?Ё)
+ ("Q" ?Й)
+ ("W" ?Ц)
+ ("E" ?У)
+ ("R" ?К)
+ ("T" ?Е)
+ ("Y" ?Н)
+ ("U" ?Г)
+ ("I" ?Ш)
+ ("O" ?Щ)
+ ("P" ?З)
+ ("{" ?Х)
+ ("}" ?Ъ)
+ ("A" ?Ф)
+ ("S" ?Ы)
+ ("D" ?В)
+ ("F" ?А)
+ ("G" ?П)
+ ("H" ?Р)
+ ("J" ?О)
+ ("K" ?Л)
+ ("L" ?Д)
+ (":" ?Ж)
+ ("\"" ?Э)
+ ("|" ?｜)
+ ("Z" ?Я)
+ ("X" ?Ч)
+ ("C" ?С)
+ ("V" ?М)
+ ("B" ?И)
+ ("N" ?Т)
+ ("M" ?Ь)
+ ("<" ?Б)
+ (">" ?Ю)
+ ("?" ?？))
 
 ;;; cyril-jis.el ends here
diff --git a/lisp/leim/quail/hanja-jis.el b/lisp/leim/quail/hanja-jis.el
index 79730b816e..6f75325945 100644
--- a/lisp/leim/quail/hanja-jis.el
+++ b/lisp/leim/quail/hanja-jis.el
@@ -1,4 +1,4 @@
-;;; hanja-jis.el --- Quail package for inputting Korean Hanja (JISX0208)  -*-coding: iso-2022-7bit;-*-
+;;; hanja-jis.el --- Quail package for inputting Korean Hanja (JISX0208)
 
 ;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
 ;;   2006, 2007, 2008, 2009, 2010, 2011
@@ -29,499 +29,499 @@
 (require 'quail)
 
 (quail-define-package
- "korean-hanja-jis" "Korean" "$B4A(B2" t
- "2$(C9z=D(BJIS$B4A;z(B: $B3:aD$(CGO4B(B $B4A;z$(C@G(B $B1$$(C@;(B $(CGQ1[(B2$(C9z$B<0$(C@87N(B $B8F=P$(CGO?)(B $BA*Z$(B"
+ "korean-hanja-jis" "Korean" "漢2" t
+ "2벌식JIS漢字: 該當하는 漢字의 韻을 한글2벌式으로 呼出하여 選擇"
  nil nil nil nil nil nil t)
 
 (quail-define-rules
- ("rk"	"$B1]2>2@2A2B2C2D2E2G2H2K2M2N2Q2T2W2X2`2o3976P$PqQ+RjS'[H[I`]aPcwgWhSkEkhlKlhmF(B")
- ("rkr"	"$B3F3J3L3P3Q3S3U5Q5S9oH9RJS>T=WmXBZ([d]W`Bk4l;r((B")
- ("rks"	"$B064%4&4)4/43444B4G4H4J4N4V:&:):1?{U!XLYc[8[K[Y[e`CarcCecgek]s*su(B")
- ("rkf"	"$B2p3e3i3k3l7GP"[+brcqf;iypbpv(B")
- ("rka"	"$B4*4.46484:4;4E4F4U7g848::0QaT,T0VHY"Y~\m]>^@aQbWeHiTm^nGoHs|(B")
- ("rkq"	"$B2!389C9gL(R:b5fpo^(B")
- ("rkd"	"$B2,3`6/607D9/959>9G9K9P9V9]9_9dFzP6Q,S3U*V>XMY,[:[|aEbee,eZf5i(jvlora(B")
- ("ro"	"$B2B2U2p2r2~3'3)3+3,3.313435383;8DP"P$PCQsXAXhYb\4^taNb5k;(B")
- ("ror"	"$B5RS=(B")
- ("rod"	"$B9#99dkf=f>o3(B")
- ("ri"	"$B2X(B")
- ("rir"	"$BnS(B")
- ("rj"	"$B5n5o5p5q5r5t5w5x<V?x?~P`PbTRZ!Z)Z*]0_Yc@d(gplwn1nSnj(B")
- ("rjs"	"$B4%6R7o7r7z80X4Ykg'iJkim!qZ(B")
- ("rjf"	"$B3i7G7f8pC4KqPu[?[\]ccq(B")
- ("rja"	"$B4;7p7u8!84Q-QxQyQzQ{\}b[g@sX(B")
- ("rjq"	"$B5h619e=&Qg(B")
- ("rp"	"$B7F7GPuX\br(B")
- ("rur"	"$B2>3J3V3W7b7cPqYH\|g-h#k.ojqnr/rps&(B")
- ("rus"	"$B3_3o7x8#8$8(8*8+8/G{KzLzPWVtWz[G`Fa+d*f0l$s$(B")
- ("ruf"	"$B5K7@7h7i7k7mLRQSY1YIYMe~r!(B")
- ("rua"	"$B3y7s8,XDY:]>d/heni(B")
- ("ruq"	"$B3fKKXDnw(B")
- ("rud"	"$B5~6%6*6-6@6C797B7D7I7J7P7T7U7Y7Z7[7_9.999<9E9L:"P7Q?QDQHQmR&R'S+WMX]\{_i`{a9a[b~e%e4e;fVfzh3krmKmtpopts](B")
- ("rP"	"$B2|3#3&3,5(787<7@7K7L7N7O7Q7R7W7\:fFOU|W@X)[G^da8b#c4d"e;eki)kSl0r!s1(B")
- ("rh"	"$B6l8E8G8H8I8K8N8O8S8T8V8Z8[8\8]9F9M9Q9b9i9p;)<J?,C!ONPFQYQjRmZ?ZJZ^[W[][^\I\_]xa`b(bPb\cLd2f*f6fxiVjCk8kFkUlKmcn~pQrurzsi(B")
- ("rhr"	"$B6J9p9r9s9tC+H#S-ZO[g\`mXq~(B")
- ("rhs"	"$B:$:%:+:-:.TgVBW}[~^xhBjnrArJs.(B")
- ("rhf"	"$B3j9|\K]qs3(B")
- ("rhd"	"$B6!6&62636u8x8y9&9)95969WPeW0YJ[}\Jd3iOi^i_lop_(B")
- ("rhk"	"$B1;2I2J2L2[2]2a8S8X8YFiTFTnTrXyfxhTixjglvpy(B")
- ("rhkr"	"$B3G3TZ2Z<[v\Zayb_oWp9(B")
- ("rhks"	"$B4'4142474=4>4C4I4P4Q4S4X4[4\6z?{P%QN]Y^ub9eEeGf%k7oQopsA(B")
- ("rhkf"	"$B3g3hH&I0Qi[XfZ(B")
- ("rhkd"	"$B3H6)688w9-9[9\T]W"Z2[%[&[Z^+bhc~d!e&e-fykToJ(B")
- ("rho"	"$B3]757SS%XyYL[Jjh(B")
- ("rhl"	"$B2q2t2u2x2z2}3!P*PzTUW_XC\G`skK(B")
- ("rhlr"	"$Bg2qE(B")
- ("rhld"	"$B9(9I9O9l^3mDo)(B")
- ("ry"	"$B3I3P3S3z5j6#6+6,65666:6>8r8s9'9*9;9J9Y9Z;->7R{UHYxZJ\r_$`Db)c#c\fKg1i`m]n[q-qaqb(B")
- ("rn"	"$B11192$2%2*3C555V5W5X5_5a5d5e5f5l5q6e6f6g6h6i6j6k6m6n6o6p6q7)8{8}9$949=9B9XC!G#H7KUP}QJR"R?RkSRU=UBUdVOV}V~WaW|XvY+Yl[M[N]?]X]\a.aLbZc`d@gOgQgqhgiUjMjdk2kMkpmsn)n9nlplq'qDq\r-szs}(B")
- ("rnr"	"$B5E5F5G6I9m9qSxT"[xdxkqlr(B")
- ("rns"	"$B7/727374[ub0b1c[f:je(B")
- ("rnf"	"$B6~7!7"KYPcRPVA(B")
- ("rnd"	"$B5\5]5gcVm;(B")
- ("rnjs"	"$B4+4,5s7q7t7w7}7~8"R%R0RKT!X+[{\^bGe<ipq"(B")
- ("rnjf"	"$B7!OOP-RP`Um,om(B")
- ("rnp"	"$B4y5"50B|DYQ\R<[z]$]Eb'dOgLkLlnm,q9q?(B")
- ("rnl"	"$B5"5.5455S@[z]Eb's}(B")
- ("rnlr"	"$BDOVn(B")
- ("rb"	"$B0*1.5,5j6+6e7=7>:"DPTwYdYw\\b#bkcad}eYj_lbm|oaqDr-(B")
- ("rbs"	"$B556Q6]d0nbsKs}(B")
- ("rbf"	"$B5L(B")
- ("rmr"	"$B2D3W6K7`7a7d9nP4QnUqV![yh{n<(B")
- ("rms"	"$B6O6P6R6T6Z6\6`6a:,Xi\]`wbbhAk3ncq<(B")
- ("rmf"	"$B7@k?(B")
- ("rma"	"$B6S6W6X6Y6^6_6b8i:#SaZ"jPsX(B")
- ("rmq"	"$B075Z5^5b5h5i5kV)(B")
- ("rmd"	"$B919NOJOKQ>Wqbb(B")
- ("rl"	"$B0k4k4l4o4p4q4s4t4v4w4z4{4|4}4~5!5$5%5&5'5*5-5/5253585;5=5@5o778J8k8p:j:k:l<(B6H)IIL'P4PXQCQpSOSZT-TtV?W1YVZ\Zz[.[9[L[w\H]c]f]k^?aCc2cEe:f3f4fMk+k1kxl1leq@qVqgr?sJ(B")
- ("rlr"	"$B5J(B")
- ("rls"	"$B6[(B")
- ("rlf"	"$B5H5K5MPKYI(B")
- ("rla"	"$B6b(B")
- ("Rlr"	"$B5J(B")
- ("sk"	"$BF`FaFqQ5U1XoY.Y<Y=[kdy(B")
- ("skr"	"$BBz(B")
- ("sks"	"$BCHFqZ:_kl_(B")
- ("skf"	"$BFhYT^:(B")
- ("ska"	"$BCKFnFoSGU3n((B")
- ("skq"	"$BG<jU(B")
- ("skd"	"$BG9L<[((B")
- ("so"	"$BBQF`FbFwG5G6G=mr(B")
- ("sid"	"$B>nUP(B")
- ("su"	"$B=wY<Y=h'(B")
- ("sus"	"$BG/G2bzmY(B")
- ("suf"	"$BYT^:(B")
- ("sua"	"$BG0WwY@\,(B")
- ("suq"	"$B@]G1Ypm:oR(B")
- ("sud"	"$BG+Sf_?`Xfd(B")
- ("sP"	"$BG)Zc(B")
- ("sh"	"$BEXE[E\G>RsUWVfW8`obug*gBqN(B")
- ("shd"	"$BG;G?G@Q/(B")
- ("shk"	"$B<6(B")
- ("shl"	"$BG:G>X=g*q/(B")
- ("sy"	"$BE.G"U>Yz\vo?o_r)(B")
- ("sn"	"$BfU(B")
- ("sns"	"$BUD(B")
- ("snf"	"$BRefmkD(B")
- ("sb"	"$BI3WY`=nf(B")
- ("sbr"	"$BWYjHjI(B")
- ("smd"	"$BG=(B")
- ("sl"	"$BE%FtG)G*Wb_>_Pg7(B")
- ("slr"	"$BE.F?(B")
- ("slf"	"$BFtWbZc(B")
- ("sla"	"$BDBWl(B")
- ("ek"	"$BB?BgCcTl(B")
- ("eks"	"$B1_C"C0C1C4C6C;C<C=C@CACCCDCECGCICJFNFXP9SET%WAXIXUZR\g^Z`NaUeKh[iijXj{j|nBs((B")
- ("ekf"	"$BC#RtU'WeZ%_}`\m}orpZpg(B")
- ("eka"	"$BC4C8C9C?CLF^S7S8T`XkY?]__,_8abb>g<i!k)k}q5(B")
- ("ekq"	"$B7#EkEzF'Quh)(B")
- ("ekd"	"$BE^EbEdEvE|F2F5Q8Vq[c\+^oaDbUc'j0j;j}oFs^(B")
- ("eo"	"$B10BPBRBSBTBWB^B_BbBcBeBgFXT2UtVhZ,Z-`^gJi7o>p0(B")
- ("ejr"	"$BFAW\(B")
- ("eh"	"$B0p?^D)D7EHEIEKELEOEQERESETEUEYE]EaEgEhEiEmEnEpEqEsExE~F(F+F3F:F;R[T&V:Y[Y\YqZ.[7[m\*]%]9^9^mbQcKe6eBeCe{h8h9k/lum%mmokpkqC(B")
- ("ehr"	"$B<3FBFDFEFFFGFHFI`1`9`We{l&qqsb(B")
- ("ehs"	"$B=cFUFWFXFYFZF[F\Z}_wa&n,q+(B")
- ("ehf"	"$BFMF\Rt[S(B")
- ("ehd"	"$B4R6ME_E`ElEoF!F/F0F1F4F6F7F8F9F<Q*\u_.aVdig^gtr<s)sj(B")
- ("en"	"$B1%3u?`EMENEZEwF&F,FIP5Y5ceflh:iQjEjFl&nFr((B")
- ("ens"	"$BFVF[F\F_g=n,(B")
- ("emr"	"$BF@(B")
- ("emd"	"$BEPEtEuEyF#F%F*F-VS\t^naVc$d[d\eX(B")
- ("fk"	"$B;IMeMfMgSIXqapaziGn6oUozq`(B")
- ("fkr"	"$B3J3ZMlMmMnMoS>\[_``8`dqQ(B")
- ("fks"	"$BMpMqMsMvP,UO]3_Q_s`%k&oVolsB(B")
- ("fkf"	"$BQoSIT?T@dzme(B")
- ("fka"	"$BMrMtMuMwQ0U:Z0]4dWeqe|k"k5nN(B")
- ("fkq"	"$B@"O9YG[VgDgEoM(B")
- ("fkd"	"$BBlBmO-O/O1O2O5O:[-`f`gh>j'lplt(B")
- ("fo"	"$BPTWR(B")
- ("fod"	"$BNd(B")
- ("fir"	"$BN+N,Z6a@(B")
- ("fid"	"$BL:N+N<N>NBNCNHNINJNLPoQ@QZSJdmdnjllpltmQmRr4(B")
- ("fu"	"$B023BEWK{N7N8N9NeNoO$O?Q6R/S:W*[q]-`4`5avbjdze8eFg0gFh-i<iCiZjBoLocqfqk(B")
- ("fur"	"$BNONqNrV'[6]+],]._Ma|c*m`mapNr/(B")
- ("fus"	"$BNgNmNxNyNzN{N}N~O!O"O#SXXxYcZ;\Bf_gHmSo:rY(B")
- ("fuf"	"$BNsNtNuNvQXY`^0(B")
- ("fua"	"$B3yNwN|R=T~ZL_2_R(B")
- ("fuq"	"$BND`Zr'(B")
- ("fud"	"$BNNNaNbNfNgNhNjNkNmNnNpSz]2_:f9fYiYpMryst(B")
- ("fP"	"$BK-NcNiNlc9h-nTp1rg(B")
- ("fh"	"$B02:mH'IyN:O%O&O'O(O)O*O+O4O7R)S$Y}[E_#_3_I_N`$atb:gbgcgdiCmJmboNoOq!qfrisC(B")
- ("fhr"	"$B3Q9w</C+NPO<O=O?[rbqc3m\(B")
- ("fhs"	"$BO@^M(B")
- ("fhd"	"$BBlBmN5N6O.O6O8S/T;Tb[0\Y`|dFiDp/(B")
- ("fhl"	"$B@%MjMkN]O(Q4T^Z']*azb}d]f#fPi2iAkQlO(B")
- ("fy"	"$BN;N=N@NANENFNKUlW!Y|["_yegfXhznRoAs>(B")
- ("fyd"	"$BN5N6iD(B")
- ("fn"	"$B<HN^N_O,O0O3Q$\l`4`5aqdMe_e`j3jzo;o{qp(B")
- ("fnl"	"$BN^^%(B")
- ("fb"	"$BI5LxN-N.N/N0N1N2N\N]N_N`R-ShT^W!ZX\X^%_H`eaneYe`g{nvo9pEq:(B")
- ("fbr"	"$BN&O;R-Y$hz(B")
- ("fbs"	"$BNQNXO@PUVFVG\2^MeE(B")
- ("fbf"	"$B7*N'N(N*XKdE(B")
- ("fbd"	"$BN4VWcc(B")
- ("fmr"	"$BO>P>pU(B")
- ("fma"	"$BQ[W)XnhR(B")
- ("fmd"	"$B0=I)KSN?NGNMVE\AhQi3(B")
- ("fl"	"$B3=8qA8C,DsKiMxMyMzM{M|M}M~N!N"N#N$N%NRNoP]P^X&Xm_"`4`5crdaf@h.h=imjBkJl>nZqkr5rEsW(B")
- ("fls"	"$BNUNYNZN[RgX'iBm8m9nC(B")
- ("fla"	"$BNSNTNVNWaepC(B")
- ("flq"	"$B3^N)N3g~(B")
- ("ak"	"$BGMGOK`KaKbKcSWU@Vw`uadb{j1j2(B")
- ("akr"	"$BGyG|KFKkKlLNUki8(B")
- ("aks"	"$B17HTHUHZJZK|K}K~L!L"OQRDRXV]VoW>W?Xp^`_TbVe\h_jGktm*mNo8q=r#(B")
- ("akf"	"$BKuKvKwbFcBg}k$p\pi(B")
- ("akd"	"$BK4K:K;K>LQLVX1f&f(gjh+hOj<j=nzr3(B")
- ("ao"	"$BGMG^G_G`GaGcGdJrK?KdKeKfKgKhL%Ug`pgugvlNn2pJ(B")
- ("aor"	"$BG|G~I4L.`Sfwl=lBoyq^sN(B")
- ("aod"	"$B0:K(LALTLUQ3]ba0hNsf(B")
- ("aur"	"$BQLQQVm]qf2k,(B")
- ("aus"	"$BJYL2LHLILJLKLLLMP[QKU_^^b@bTeDsQ(B")
- ("auf"	"$BJNLG(B")
- ("aud"	"$B;.L=L>L?L@LCLDZy\U^rbTh,j&nIsf(B")
- ("aP"	"$BjV(B")
- ("ah"	"$B18243}G|InJgJhJiJkJlK9K?KAKEKFKHKlL0L6L7LNLOLSLWU(ZV`S`pa(b&bHcjdwfNfnhOkuqxr|(B")
- ("ahr"	"$BI$KRKTLZL\Q^[7]teYg|s/(B")
- ("ahf"	"$BKWL^]G]s(B")
- ("ahd"	"$BL4LXQOTm[$[/](_Bb^ga(B")
- ("ay"	"$B1,@&G-I@IAICIDIEJhL/ZbZe^]b?eMg{i8(B")
- ("an"	"$B@&I5IoIpIqIsJjJlK4K?KEKGL3L5L6L7L8L9LPU(V`W'XcXlYEZ[\>bHeYhOj]kX(B")
- ("anr"	"$BKAKOK|L[`Tfn(B")
- ("ans"	"$B2cJ-J8J9JZLHLdLfLgLhPnQfX$XpY_e$(B")
- ("anf"	"$BJ*L^(B")
- ("al"	"$B3aFfHxHyH}H~JFL#L$LBLoU;VKW9W=_>_Pdve[i/m?sHsSs`(B")
- ("als"	"$BIRL1LeV1X>XbZa^#eNf+o\sf(B")
- ("alf"	"$BL)L*\ikm(B")
- ("qkr"	"$B9}GmGnGoGqGsGtGuGvGwGzG}JmKPKQP8YsYv\w^p`a`yg.p;qPr0rX(B")
- ("qks"	"$BH<H>H?H@HBHCHIHJHKHLHRHSHWHXJ1JVJ[YBZ5\Q_/amcme+fvj6k'm*(B")
- ("qkf"	"$BH-H.H/H0H1H4KVUVX#Y6Y{^_b"b$cAlmq{r1(B")
- ("qkd"	"$BJoJ|J}K'K,K.K5K7K8K<K@KBKCKIR9RMUxVsWEWGZU[D\V^qb|cmg/gVhpiSkno%qwr7(B")
- ("qo"	"$BGPGRGSGUGVGXGZG[G\G]GeGfGrKLT/WQX`YA^\_d`jfujj(B")
- ("qor"	"$B3|GFGlGoGpGrGuI4PQVg[1`aa)cndjr0(B")
- ("qjs"	"$BH(H?HKHMHQHVHYK]ZYZZ\h_/_xc)effLg8j[o@s=(B")
- ("qjf"	"$BH2H3H5H6f/(B")
- ("qja"	"$BHAHEHFHHHOK^[p^"c{gw(B")
- ("qjq"	"$BK!`k(B")
- ("qur"	"$BI{I}JHJIJJJKQ|Z&]!`za2i0j~m2mdospH(B")
- ("qus"	"$BHPJQJTJUJXJ[MhQ~RFY(Y7ZN]repg&jokfmgn4n5qX(B")
- ("quf"	"$BHcJDJLJMP(Z~sh(B")
- ("qud"	"$BIBIMISJ:J;J<JAJBL_V"Vu[D\V_[c=cme3m~q6qX(B")
- ("qh"	"$BD=F>IVIaIcIhJ]JbJcJdJeJnJsJuTHUoUph^jppfse(B")
- ("qhr"	"$BIzI{I|I}I~J!J"J#J$KMKNKPR6Z=Z>\w]M_Ad9h*hyiui}j`m.mUmVqFrX(B")
- ("qhs"	"$BK\TqlL(B")
- ("qhd"	"$B0)HFIuJpJtJvJwJ{K%K)K*K/K1K@^"_bcsdK(B")
- ("qn"	"$B3x4L<C@lG]H]ITIUIVIWIXIYIZI\I^I_I`IbIcIdIeIfIgIiIjIkIlImIoItIzI{I|J#J$JmJsK6P=PZPmP|RuS_T4UUU[Y8YC[T[U[o\T]M^pf)g%gYgxijk>lRlgmUn>n]rjrksOsPse(B")
- ("qnr"	"$BKL(B")
- ("qns"	"$BBNHRH[J,J.J/J0J1J2J3J4J5J6J7K[K_RfW][C]d]p_9`6a'a=cic|gnlL(B")
- ("qnf"	"$BITJ&J'J(J)PGWJWgYD[,`Ac1q|sd(B")
- ("qnd"	"$BC*J+JxJ~K2TDW:boe^(B")
- ("qmr"	"$BR6(B")
- ("ql"	"$B7%H[H\H]H^H_HaHbHcHeHfHgHjHkHlHnHpHqHsHtHwHzH{H|I!J(JOP#PlR8SgU&U9U{X`[,\R`Aa]acbNbgc0c>dDdcdue#f1fGg#g$g>hKhoitjkl"l@lAlLl]nAp)pBp[pfqorL(B")
- ("qls"	"$BIFIKILINIOIPIQLFUMZ/]']R_@eoi@p~r&(B")
- ("qld"	"$BI9QRQVQ_U2Xaf[qHqU(B")
- ("tk"	"$B278%:3:6:;:=:>:?:@:p;E;G;H;J;K;L;M;N;U;W;[;`;b;d;e;l;r;t;v;w;{<%<-<K<L<M<N<O<P<R<S<U<X<Y?)?ZFcGAL&L,LcP/PXQPRSSNTzU0UmWP[O[h\L]y^/^V_C_S`:`[aBc+c,codAdBdCe/fSfhgRh5iImfnanmqJqKrBr^sM(B")
- ("tkr"	"$B:o:s:w?tSVZK\N`#oK(B")
- ("tks"	"$B;1;3;5;6;9;:;;;@IGQh[<]haMedlioYo[(B")
- ("tkf"	"$B;&;';5hq(B")
- ("tka"	"$B;0;2?9?yRTWD^zdsexf.glhujN(B")
- ("tkq"	"$B07=BA^Yg]=_'_(p@q%(B")
- ("tkd"	"$B7,8~=}=~>&>(>0>2>E>M>X>\>]>^>e>o>uAPASAVA[AjAzA|BlBmErF=FKH"MMRVUCURVyV{XS\k]O`.a3fFjak<ksrh(B")
- ("to"	"$B:I<%^/_Sg(lPp{rT(B")
- ("tor"	"$B:I:p:w?'T'XG\ecQi,(B")
- ("tod"	"$B1y>J@7@8`Ocy(B")
- ("tid"	"$Bq.(B")
- ("tj"	"$B5P:T=k=l=n=o=p=q=r=s=v=x=y=z={?p@3@4@>@@@BAMD)L;P0ScTPTfVYY3ZFZGd.e1fTf]fqsUsk(B")
- ("tjr"	"$B3c<.<M<a<b@J@K@N@O@P@YM<^Hb,hnirj.jinYnq(B")
- ("tjs"	"$B4T@f@g@h@k@p@q@v@z@{@~A"A#A%A*A-A/A1A5A6A7C1OKQ"SEUIUvX:^/`!a}c8e@fAgUiElqpG(B")
- ("tjf"	"$B1L6}7@@^@_@b@c@eC-FQSwYM\8]u^Xe(e2eJi-jxsv(B")
- ("tja"	"$BA!A.UQZ{]@]S]Tcxeyezj9k~lXnu(B")
- ("tjq"	"$B=&>D@"@]RYSqXRXwYpfcm:oRq#(B")
- ("tjd"	"$B>J>k@+@-@.@1@9@;@<@?@CX9Zp`Od-fag)(B")
- ("tp"	"$B:P:Y:{@$@*@G@b@vLcWB^/ih(B")
- ("th"	"$B037+:i<D=j>$>%>,>.>/><>?>B>C>F>K>P>R>S>dA:AAABAGAIAJALA]A_AcAgA{B}I%R#SbU?XG[`\f][]{^j_O_va4d,dTg[hvi+i?l!lsmvn:n[nyp<ppq[rCrM(B")
- ("thr"	"$B0@B+B.B/B0B3V$etkll^(B")
- ("ths"	"$B;AB9B;B=C'(B")
- ("thf"	"$BN(j+(B")
- ("thd"	"$B>>>YAWAwW~[@^DcpgNiOkVo1psr"(B")
- ("thkf"	"$B:~(B")
- ("tho"	"$B:?:U:~;&;/^/_S`tbl(B")
- ("thl"	"$B?h?jTj(B")
- ("tn"	"$B<i<j<l<m<s<u<w<x<y<z<{<|<}=$=%=(=+=/=2=7=C=I?\?b?c?e?g?k?o?p?q?tA\AiB5C(C/D\JfLyM"N(RWS4SUSVT1ThU?V-X{YSZ@ZK]U]z^,^l^{_|`Yc.cOdXdoe5e7elf7f{g!g;h%h5hki.j-l(l3n.nHnsnxo5p$p+qrr$(B")
- ("tnr"	"$B=G=H=I=J=L=M=N=OPhUY`GfihChr(B")
- ("tns"	"$B=V=X=Y=[=\=]=^=_=b=c=d=f=gFkWNWv^-d#d$f|h&hsh|kNkYo>s((B")
- ("tnf"	"$B=Q=RN(WuX|[2(B")
- ("tnd"	"$B?r?shE(B")
- ("tnl"	"$BPfPg^C(B")
- ("tmf"	"$BI(`niMi|(B")
- ("tmq"	"$B<>=&=,=1_<jyp.(B")
- ("tmd"	"$B>!>#>5>:>g>h>jANFlGhP+QtR4[Fejj$o~(B")
- ("tl"	"$B0;3A:|;&;H;O;S;T;\;k;m;n;x;{;~<(<,<E<F@'DsLpRQSASOS]UyU}W#W6WtYy`JfBg(gShahikkl5l9p{(B")
- ("tlr"	"$B6t<0<1>}>~?!?"?#?)?*B)Uf_omHq3(B")
- ("tls"	"$B:g?-?.?1?5?7?=?@?B?C?E?H?I?U?V?WC$GjH8RqS"UbXFY;Zo_~iglYpur`(B")
- ("tlf"	"$B<:<<<=<BUi\Cj)(B")
- ("tla"	"$B;2?3?4?<?D?R?SRTWZ\;]n_)_Dh~o=(B")
- ("tlq"	"$B=&=:===BDTRARB_'_(a#cgdb(B")
- ("Tkd"	"$BAPRV(B")
- ("Tl"	"$B;a(B")
- ("dk"	"$B0!0"0$2d2e2f2g2j2k2m2n368f;yP3Q;S(U.U4V6[s`Ha^h0jKk(kCn{o<rms!s"(B")
- ("dkr"	"$B0!0-0.0/3Y3Z3\DWOLP3RxTAVVVjX(X3\[hUhVh`k`n?s-sys{(B")
- ("dks"	"$B0B0D0F0H4_4c4f4g4i8APtZg]Vpzr=rnro(B")
- ("dkf"	"$B060D1ZX~Y!]"]1]Fk@mBn!odpK(B")
- ("dka"	"$B0C0E0G1^264`4b4dVIV^h?k^pws_sa(B")
- ("dkq"	"$B0(052!3{R}TZ`@(B")
- ("dkd"	"$B1{6D97Wi]J]vc?pYrs(B")
- ("do"	"$B0%0&0'3336373eS1SNS`T<V=[#]7b-bJbYbvc(ghi=oup'pKpOq>(B")
- ("dor"	"$B1U3[LkLqY/YUf~mCoup'(B")
- ("dod"	"$BSm]/f"rts@(B")
- ("di"	"$B<M<P<Y<c<fG8LiLjLkLlLmLnYh\?s,(B")
- ("dir"	"$B0s<c<eLsLtLvU>Ynd`h`hji;oPs4s~(B")
- ("did"	"$B>\>m>n>w>y>zMHMLMMMNMSM[M\PSTaUPWyZ7ZfZx\k_!_G_laZagaxc:cUjwl*nVqh(B")
- ("dj"	"$B1w5y5z5{8f8lS0S}S~^Kq,qGrNsw(B")
- ("djr"	"$B2/21225?M^\z(B")
- ("djs"	"$B1a8@8AGgI'PpUA_adN(B")
- ("djf"	"$B]"]1(B")
- ("dja"	"$B1b1f264`4d8387Q7RLSnV^Vx^;f,ofqd(B")
- ("djq"	"$B6H(B")
- ("dp"	"$BWk]P(B")
- ("du"	"$BFrG!M=M>M?M@MAMBP.]C^.aBe1gMgPh'i1ikl%q1(B")
- ("dur"	"$B0W0h1V1X5U<MKrLrLuXdehinl#o`ogp?qcrH(B")
- ("dus"	"$B0v1c1d1h1i1l1m1o1t8&8'<!A3FPFpG3J%RdSkU+U/WzYPYa\=])^'^2^7^=_]d'gCh/icj@l'(B")
- ("duf"	"$B0v1Y1\@bG.ReSYsv(B")
- ("dua"	"$B1^1j1k1p1v@wL-QG\ygfgroeqyr6rPsEsa(B")
- ("duq"	"$B1^MUSq[!pT(B")
- ("dud"	"$B1D1E1F1G1I1J1K1M1N1O1P1Q1S7J7^RiS[TJU$U%Zu\3\F^s_J`r`}`~ewj>lWn;pD(B")
- ("dP"	"$B0e1C1H1L1T4"7X7];y<IM@MBP)P.PdQ;Q<St[*]u`IbKbOcRfJghi"i#i:iRjcl%l?p?rIsL(B")
- ("dh"	"$B0-1(1*1w1x1|2(8^8`8a8b8c8d8g8h8mP~S*SKSSTITTT|U<UhWXX(XeZDZm_4_r_z`3`iiej(n+o2rbsg(B")
- ("dhr"	"$B0$206L9vM`(B")
- ("dhs"	"$B292:X2aicSi%i>jrr[r\(B")
- ("dhf"	"$BQ:\Eg,(B")
- ("dhd"	"$B2'MJTYW+a%a1a~c<hcp6s0(B")
- ("dhk"	"$B0#122i3?4$7&RwSyc]hbiwkBkw(B")
- ("dhks"	"$B08404K4P4X4a4e4hOPOROSU6^1_5iol2op(B")
- ("dhkf"	"$B[)(B")
- ("dhkd"	"$B1}2"2&9DUwWH[>]j(B")
- ("dho"	"$B0#3?OARwbdiw(B")
- ("dhl"	"$B0Z307(VLV[`Pbvi'r>(B")
- ("dy"	"$B1z3Z6F9x>qD8F+LsMEMIMKMRMTMWMXMZQ'TpU-UKULVRVvWTWUY9YjYz\[\v]H_$`"`vcXc_eeh}j4kon-n3qAs8t!t#t$(B")
- ("dyr"	"$B?+C+M]M_MaV;^ieUhljs(B")
- ("dyd"	"$B23B{M&M/M0MCMFMGMOMPMQMVMYP\XJXY\Wa5f`gNill}o0ps(B")
- ("dn"	"$B0r1&1'1)1*1+2$2%5m6h6r6s6v6w6x6y?uKtL`M$M%M'M+M4M9P2P}R^R_VJ\d]?]XaOb3c;c<d~foi9kpsIsz(B")
- ("dnr"	"$B000jR(TT_4_z(B")
- ("dns"	"$B0w1$1>1?1@Zt]N_pe"fQp(pq(B")
- ("dnf"	"$B080S1516]5_q(B")
- ("dnd"	"$B7'M:(B")
- ("dnjs"	"$B080w1!1`1e1g1n1q1r1s1u3@4j85868;I2QMT$T(U6UcXE^S`)gkiojOkdmWn|ovp((B")
- ("dnjf"	"$B1[7nXz[)denh(B")
- ("dnl"	"$B010L0N0O0Q0R0S0V0Y0^0_0`0b0c161R4m56OAQ&S@SxT#Vk^O`*a_eOh<ivjLm{pjr2(B")
- ("db"	"$B0T0]0d:y<t=@D\FSFjFyF}G(KnL{L|L}L~M!M"M#M(M)M*M-M.M1M2M3M5M6M7MDPRQASHS|U^ViXoYfYiZA\@^a^b`qahdre7g+gLhPi$iXj!j"j@k!k0kglzl|n'nXo+pds[sl(B")
- ("dbr"	"$B0i4!FyS|]Zdx(B")
- ("dbs"	"$B0t0}1<=aUzlVnJ(B")
- ("dbf"	"$Bffrr(B")
- ("dbd"	"$B=?M;e0(B")
- ("dms"	"$B1#286dRaT-T7X@X[]V`;p,su(B")
- ("dmf"	"$B255?(B")
- ("dma"	"$B0{0|0~1"2;5?6cR_U5V@];pF(B")
- ("dmq"	"$B5cM,M8X%(B")
- ("dmd"	"$B1~5?6EBkGhXfg?j$m@mA(B")
- ("dml"	"$B0M0U0X0a365#57595<5?5A5B5C5DODPaV=VTVXXt]:_q`Hbcc&ePg_nPq>(B")
- ("dl"	"$B0;0J0K0P0W0[0\1B;\<$<)<*<X?)BBBfCPFRFsFvP1U)UuVaW3W4W^^&`ba-aXfggokHlFlHlIm_mnp0(B")
- ("dlr"	"$B1WMbMcVXW5[;fDkjs2(B")
- ("dls"	"$B0u0v0x0y0z1l?M?N?O?YFRG&G'LbP@PAQ9QcTEUTW.]e^P_]h!h;iNpW(B")
- ("dlf"	"$B0l0m0n0oF|P!PETejRn_o-(B")
- ("dla"	"$B1A?QDBG$G%L-U,WljSjT(B")
- ("dlq"	"$B9~F{F~R]T)rl(B")
- ("dld"	"$B>jP;QtUT(B")
- ("wk"	"$B040q:4:8:::^:n;F;I;P;Q;R;Z;g;p;q;s;z;|<"<'<+<Q<T@F@QDSI&PwQ}RoR~UZWs^h_Ua*aSbDbEdggsh$hti4i5k9lGlZl`r8s:sn(B")
- ("wkr"	"$B:n:r<[<]<^<_<`?]?}SpU"UeZQ[P_Zd+e?ginLs'(B")
- ("wks"	"$B;7;DV#X}\"]L_%b7(B")
- ("wka"	"$B;=;C@xC9V*_*_+d>dQjDlQo4(B")
- ("wkq"	"$B;(AYA^C}SrYgd4p7p8(B")
- ("wkd"	"$B>">)>->1>8>@>O>Q>U>_>c>f>l>s>uATAqArAuB!B"D"D%D2D9F5P?TGTVTcTyT}U#UrVQW2\u\~^J^y`-`/`R`xaog6gGgIg`h7hIi,i6jfl[l\o6rc(B")
- ("wo"	"$B:F:H:K:M:R:X:[:\:_:`:b<F@FB8^hc7eRexl9lZsn(B")
- ("wod"	"$BA9AdAhAyVDVl`'bUd7d8kZo#(B")
- ("wj"	"$B093n5O<Q=m=s=t={=|A;A@CtCuCvCwCxCyDcDlDqE!EKGgH$LYPJRrW7Y3[A[R\:]|_L`2aTbicle*f8fTgsiWk:kIl7m0p3sr(B")
- ("wjr"	"$B2.<Z<d@Q@R@S@V@W@XB1C`CdD$D_E&E(E)E*E+E,E-LvR*W/_U`?a{c!d{gii4k6mlmqmx(B")
- ("wjs"	"$B<2=W@o@r@s@y@}A'A,A0A4B7C.DQE5E6E8E;E>E?EAEBECEDEEG{H*KjMdQ#QrR4RdSsT{UsV\W%X"X}Y%ZBZS]a^!_E`0a/aYaub!c"d%d5d?euf?fHg"lcm7mYm[nonto"oCp4pSp|q4qBs6s7t"(B")
- ("wjf"	"$B=`@Z@[@^@`@a@dCbLERERGRzY#ZqZr^6cffOlkmE(B")
- ("wja"	"$B0>@jA2E9E@FQG4V3dRpAsVsZ(B")
- ("wjq"	"$B@\D3XR\&\7\D]~^XfcrW(B")
- ("wjd"	"$B0f;*>=>Z>`>p>t>{@,@/@0@5@:@EBGCzD.D:DbDdDeDgDhDjDmDnDrDuDvDwDxDzD{E"E#E$FTKoLwMdP'RZVlY]ZW[l^F^[a6aKbMcWf^hGj:mwn&nDnKoFp=pP(B")
- ("wp"	"$B1-:O:Q:W:]:^=t=|@)@=@F@^BhBiBjDiDkDoDpDsDtD}P_Q1Q}Z+Zq_;bDbEbIgAi5lZm3pIpmpnsn(B")
- ("wh"	"$B3v7+:x;4<D=u><>H>[>rA;A<ADAEAFAHAKA`AaAbAeAfAgAlAtAxB$BdC{C|D$D&D+D,D/D4D7D8D;DUD^D_D`FXGBH%POPYS^SdWIXNXTXjY2Y4Zj[j[t\'\*_6`,bic/cGcZc^cud|e6f-fTfrg]iskGkPl!ldm/oXp:qt(B")
- ("whr"	"$BB-B2dHhwo7(B")
- ("whs"	"$BB:YO(B")
- ("whf"	"$B@[B4OHR@`L(B")
- ("whd"	"$B<o<p=!=*=>=D>a>bAnI"P:WOXQ\#\$\b^JdpeTj*l{m'm)oG(B")
- ("whk"	"$B:4:8:A:B:C(B")
- ("whl"	"$B:a(B")
- ("wy"	"$Bn[(B")
- ("wn"	"$B3t:n<g<k<n<r<v<~=#='=.=5=;=K?_AUAvB-B2ChCkClCmCpCqCrCsD4D]I*L+P&PMPvQ2QISUW$ZlaFaGcGdVdZe!eBfthwiakOlam4mTn$oIsG(B")
- ("wnr"	"$B4!C]dx(B")
- ("wns"	"$B1==S=T=W=Y=`=c=eFVH;KpQ.RETSWvX"X6^4_=b/jAm-mu(B")
- ("wnd"	"$B=0=ECfCg(B")
- ("wmr"	"$BB(B1(B")
- ("wmf"	"$B6{(B")
- ("wma"	"$BWc(B")
- ("wmq"	"$B=4=AIxM,\7eI(B")
- ("wmd"	"$B3(9y>I>Z>xA9A=A>A}A~B#D'YN\t__kz(B")
- ("wl"	"$B4t5@;V;X;Y;];^;_;c;f;h;i;j;o;}<1<A<G?%B~CNCOCRCSCXCYDRDlDqEVG7S!T.TMVcW7Yu[L]ma\c-fMfsgSk:lDlSlflym5mIn/owr?s9(B")
- ("wlr"	"$B?%?&D>SDcFcM(B")
- ("wls"	"$B?0?6?8?:?>???A?G?J?L?P?T?XC$DADCDDDEE6FxKyPVSQZi]I_~`_a+a;b8bCbSeVgKhmjWlcmGo/(B")
- ("wlf"	"$B<8<;<@<ACaCbE3IHLEPERzSDT9Ve[_fOg4g5lDlkmE(B")
- ("wla"	"$BD?ZPnErq(B")
- ("wlq"	"$B<9=4=8=AeI(B")
- ("wld"	"$B@!D'D(_-(B")
- ("ck"	"$B3n:!:5:7:9:<<V<W<ZOMPNSMV+VMY-Ym[3\Lbxd4gsm"n`(B")
- ("ckr"	"$B:q:u:x@NB*ByCeCxY'eSm0oXsqsx(B")
- ("cks"	"$B;8;<;>;?;A@qRUZ9`&cbdlesl-lUo4oSoTqB(B")
- ("ckf"	"$B;!;";$;%QkY)`\e'(B")
- ("cka"	"$B;2;4;BA2Q(Q)RTTOVPVZXNXOXPXrXs\ackk{k|l)l+q](B")
- ("ckd"	"$B>'>+>3>4>;>T?zAOARAdAkAsD*D1H+PiQlRRX0XHYoZHZd^E^k^}`KalcYgZm#r.(B")
- ("co"	"$B:9:D:L:N:S:V:W:Z<F@UMi\Me=hql8n`pV(B")
- ("cor"	"$B:p:t:u:v:}@UA<QFSTY>[Pbyd)dG(B")
- ("cj"	"$B:J=h@(A@Q]X.^Ge1hF(B")
- ("cjr"	"$B;I<\@I@L@M@TD=QqRhWFZ3^~akinljm$m(m6p"s5(B")
- ("cjs"	"$B0+6N6z6|;=@i@n@q@t@u@|A$A&A(A)A+C)E7PBPjQdSCV_Z#[a\9^I^Y_Ea$chh(lMlxoqotph(B")
- ("cjf"	"$BDVE/E0E1E2E4FLFmS5V%YZmPnno$oDoEq8(B")
- ("cja"	"$B84@mE:E<Q!W[Ww\a\y]~b]dSdUd^d_j9k-k[k~(B")
- ("cjq"	"$B>*>9>vC}D!D-D5E=aHaIaJbLjymLmM(B")
- ("cjd"	"$B;*;,@2@6@A@DD#D0W,W-fehGiq(B")
- ("cp"	"$B@ZBNBXBZBaDVDfDyD|D~FeFmSFSiSjYZ\<^8^|bIbfh\hxjim<m=n*pLqsqv(B")
- ("ch"	"$B7-=i>%>6>7>A>G>K>L>S>V>d?]A?ACApD6D8ICQvR#R+V%V9X!X7X^[B\%^W_VcDggkWl:mknLndqzs<ss(B")
- ("chr"	"$B<q>|?$?(?tB%B0SvV$ZKb`badHifk=m1o7qq(B")
- ("chs"	"$B1%@#B<WVn7(B")
- ("chd"	"$B=>=FAQAZAmAoC~DMF4G,N5N6P:PxR2WOWdX;eAeTfb(B")
- ("chl"	"$B:E:GVCYt\c^/(B")
- ("cn"	"$B0,1/3b<h<q="=%=)=-=6=9=P?[?d?m?n?u?v?wAFC\CjDFDGDHDIDJGkOISBU7U9VdX/YXYY\6\d^Wa,b2cTd6dHeWf\gmhZn@p%p2pcqWqerUsF(B")
- ("cnr"	"$B1/<3<4=3=K=LC[C\C^C_C`M.\egXm&(B")
- ("cns"	"$B=UDXrV(B")
- ("cnf"	"$B=P[2sY(B")
- ("cnd"	"$B2-=<=F>WCiCnCoMCQU`>g^j5(B")
- ("cnp"	"$BX,X-X8aahDlT(B")
- ("cnl"	"$B<h<q="=-?a?f?i?l@HOIS\U8X8Ye\r]^aafCf\g9hDk9nMqe(B")
- ("cmr"	"$BB&B'B,D=P<X<Z`(B")
- ("cms"	"$Bsp(B")
- ("cma"	"$Boo(B")
- ("cmd"	"$BA=A>AX(B")
- ("cl"	"$B:7:9;u<#<&>}?"?%CMCQCTCUCVCWCZD'D>FePLRHRNSPTiV5VbVpVz[i_ua7a?awbtcPcze#e>eLfWiPjul8lemOo!p5r5rKrvrwscso(B")
- ("clr"	"$BB'B,D<R,RNVzX<ZE(B")
- ("cls"	"$B?Fk%sp(B")
- ("clf"	"$B<7<?(B")
- ("cla"	"$B5N?/?2?;?KC9D@KmUjWZZP\;o*o,ooqT(B")
- ("clq"	"$Bj/(B")
- ("cld"	"$B>NGicJjYqU(B")
- ("cho"	"$B2wTo`V(B")
- ("xk"	"$B<XB>BBBCBDBEBFBGBHBIBJBKBLBMCSOMPIS#TXU`YYYe[4\s]}g!m>qLrx(B")
- ("xkr"	"$BBnBoBqBsBtBuBvBwBxByE'EYPkS6Y>[Q_7ner0(B")
- ("xks"	"$BBMC2C3C7C:C>CBCFF]FgW<X_Z:]QjX(B")
- ("xkf"	"$BC%C&(B")
- ("xka"	"$BC5C?b>lE(B")
- ("xkq"	"$BEcEkYr\PpaperW(B")
- ("xkd"	"$BEfErE|F"Vfb;j#(B")
- ("xo"	"$B@GB@BABUBVBYB[B]BaBfBgG=KXLaQ<\(cze)ihkHq&qM(B")
- ("xor"	"$BBpBrBtZ$_7(B")
- ("xh"	"$BEFEGEQEZEeF$Q=h9(B")
- ("xhs"	"$Bjt(B")
- ("xhd"	"$B23DKDLE{E}HuWxXV(B")
- ("xhl"	"$B?dBOB\B`DHDIDJFXjtpx(B")
- ("xn"	"$BEJEjF)F.L{Pye5o+qmr,(B")
- ("xmr"	"$BB_FCXW(B")
- ("vk"	"$B?|GCGDGEGGGHGIGJGKGLGNHmHvT3WfZ4[1`(``bncvfRg8hJh]jZllox(B")
- ("vks"	"$B:d:eH=HDHGHNR!]ra"ng(B")
- ("vkf"	"$B;+H,R\[5n\(B")
- ("vo"	"$B143-GIGTGWGXG\GbH4HmI#PPUVX#Y6ZT[1]o`cp>(B")
- ("vod"	"$BC*K#K5KDW:WEZU_0b|e^(B")
- ("vir"	"$BX?(B")
- ("vus"	"$BJ?JPJRJSJTJWJXJ\Y(fIgyi~jokfqY(B")
- ("vua"	"$BlJ(B")
- ("vud"	"$BDZI>IMJ?Wh^$bogyhLr9(B")
- ("vP"	"$B3AGQGYJ>J@JCJDJEKJUJVrW&ZIZMasi0qo(B")
- ("vh"	"$B1:3s3wGxGzI[I]IrJ^J_J`JaJqJyJzK"K$K&K+K0K=R1R5R7RvS.T5YF[T_F_\aWb.f}gTgzj\jqmynppRq0q}r:rDsR(B")
- ("vhr"	"$BGxGzI}K=_F(B")
- ("vy"	"$B<]I6I7I8I:I;I<I=I?QwUEXX]Ke]q(q)q*q_qjqurd(B")
- ("vns"	"$BJ,(B")
- ("vna"	"$BIJcHcI(B")
- ("vnd"	"$BIvIwK-afkel4q$qH(B")
- ("vb"	"$BI7(B")
- ("vl"	"$BH`HdHhHiHmHoHrllmdox(B")
- ("vlf"	"$B2^HfHgI$I%I+I,I-I.J'J)PGYDdJkvm+s+(B")
- ("vlq"	"$BI/I}K3^"(B")
- ("gk"	"$B2<2?2F2O2Y2\2b2l3E<6ROR`V|^Q`leKf!kEl.n"o(rQ(B")
- ("gkr"	"$B2)3X5TDaT[U\U]^A`Bajkbl;s?(B")
- ("gks"	"$B4(4@4A4M4W4Z8B:(UFUGW{Y*YRZ][e_K`Cb*f'n8qSqlsm(B")
- ("gkf"	"$B323d3e3mR$bRiys\(B")
- ("gka"	"$B4O4Y4^H!MtQbRyS2S?VH]#^>eHh1n8nro|pwq2rRsD(B")
- ("gkq"	"$B389^9gH:RnR}^eb4b5b6hdonr{(B")
- ("gkd"	"$B7e9+91939:9A9R9T9_9`FzP6PDRbWqe}fjobprr*(B")
- ("go"	"$B0g2r3#3$3*3/31323:3<:zPsT6TnTxUXW(Xh\4i&j7k;k_n0nOqO(B")
- ("gor"	"$B3/3Kbkk*mJ(B")
- ("god"	"$B0I8v9,9Te.jbr}(B")
- ("gid"	"$B5}6?6A6B8~9aSlq.(B")
- ("gj"	"$B135u5vTR[[]A^w(B")
- ("gjs"	"$B7{8%8.YW`[(B")
- ("gjf"	"$B]<iyj8(B")
- ("gja"	"$B8183VUp*qd(B")
- ("gur"	"$B3E3R3W7CTu^)r+(B")
- ("gus"	"$B0<7|8)8+8-82898<8=8>8?9`JGPWRl^-aRbAeQidjJnkp}(B")
- ("guf"	"$B7j7l>iJGLRUSk#pv(B")
- ("gua"	"$B7y(B")
- ("guq"	"$B0A3p6"6(6.64696<KKOFTsV7XDYQ^5`Ed)d:h2nwo}p!(B")
- ("gud"	"$B3>5|7:7;7?7A7U7V7e9UTk_W_X`rfzj%mj(B")
- ("gP"	"$B7E7RQBR>TxWBX*b=c4l~nQp^(B")
- ("gh"	"$B3O8C8F8L8M8P8Q8R8U8W8[8_8c8j8n8o9%9@9f9h9j9k:c;)<JD[QTTdW`Y&Z_Zn\5]]]l^v^w`7`ha!b(b+hYhfiHiKizn=o.q7(B")
- ("ghr"	"$B0?9s9tOGUeZO(B")
- ("ghs"	"$B:':*:+:.:2[~\!^U^g_c`m(B")
- ("ghf"	"$B3K9z9{]Gcts3(B")
- ("ghq"	"$B3f(B")
- ("ghd"	"$B909?9H9cR|]g]wkAobr*(B")
- ("ghk"	"$B2=2P2R2S2V2Z2_2h3q3r7$CtOBOCS;V<aAdqo&(B")
- ("ghkr"	"$B3H3M3N3OZ2Z<ayb_j?p9(B")
- ("ghks"	"$B4-45494<4?4D4T4]88OKT(TvUaUnXu]D^R^S_eb*bAbbl,l6oBqir%r](B")
- ("ghkf"	"$B1[3h3j;#`Qbwi]l/ohoi(B")
- ("ghkd"	"$B2+677;92989D9SKZQWQ`WSWrX5Zh^T^f_jd;dPfki{n#p&rS(B")
- ("gho"	"$B2h7S`VaA(B")
- ("ghl"	"$B2q2s2u2v2y2z2{3"3%=ZI0OEPrQER;TUWKXg[X\G^Neig:h"i'i\kKkRmorf(B")
- ("ghlr"	"$B2h3D3MaA(B")
- ("ghld"	"$B2#909U9li*mDo)sT(B")
- ("gy"	"$B6G8s8z9;9Z:hP{S,SeSoZCZ|[f^B_^`+qaqb(B")
- ("gn"	"$B0r5`8e8t8u8|9!9"PHRcSLSR^A_h`Md<kMmp(B")
- ("gns"	"$B7.7071FkR._m_nhXnU(B")
- ("gnd"	"$Bi*(B")
- ("gnjs"	"$B3~7vCHX:Zwh@kcl,(B")
- ("gnp"	"$BCnRCS<TL_{(B")
- ("gnl"	"$B4x5+51WCY&Zv]`ka(B")
- ("gb"	"$B5Y7H7MC\Z8_^iLl<(B")
- ("gbr"	"$BC\(B")
- ("gbf"	"$BWukys;(B")
- ("gbd"	"$B6$6'6;R3Wo^((B")
- ("gmr"	"$B9un^(B")
- ("gms"	"$B6U:/WLWWYWnW(B")
- ("gmf"	"$B5%5IKxV(k?(B")
- ("gma"	"$B6V7g(B")
- ("gmq"	"$B5[]@^*b%fE(B")
- ("gmd"	"$B6=Fz(B")
- ("gml"	"$B4n4r4u5)5:5>I1Q%RzS)S`XAXZY&Zk[']8_f_g_t`!`:c6f<nZrF(B")
- ("glf"	"$B5Merk#pvs\(B")
- ("unknown"	"$B4#<5DNFJFdFuJ=KsL]QeRIRpS&S9SuS{T*T+T8T:T>TBTCTKTNTQTWT\T_UNU~V&V,V-V.V/V0V2V4V8VNW;WjWnWpY0YKY^Z1Zs[=[b[n\)\-\.\/\0\1\O\S\j\n\o\p\q\x]&]6]B]i^<^L^c_&_1`<a:a<a>b<bBbXbmbpbsc%c5cNcdc}d&d1d=dIdLdYdddfdhdte9eaebemenevf$g3g\h4h6hHhMhWhhiFi[ibj,jQj^jmk\lCmZmhmimzn%n}o'oZo]p#p-pXp]p`q;qIqRr;r@rGrOrZr_rer~s#s%(B"))
+ ("rk"	"榎仮伽価佳加可嘉嫁家暇架歌珂稼苛茄迦駕街袈个假價呵哥枷柯珈痂笳舸葭訶謌賈跏軻")
+ ("rkr"	"各格殻覚角較閣却脚刻塙卻咯埆恪愨擱桷殼狢覺貉鬥")
+ ("rks"	"斡乾侃刊姦干幹澗看竿簡肝間墾懇艮菅奸慳揀杆柬栞桿狠癇稈繝艱諫鶫齦")
+ ("rkf"	"介喝渇葛褐掲丐曷碣竭羯蝎鞨頡")
+ ("rka"	"勘堪感憾敢柑甘監鑑欠鹸減紺凵坎坩嵌戡撼橄歉淦疳瞰緘蚶轗酣鑒龕")
+ ("rkq"	"押蓋甲合岬匣盖胛閘")
+ ("rkd"	"岡橿強彊慶康控江糠綱腔講鋼降剛虹亢僵啌姜崗慷扛杠棡疆矼絳繦羌薑襁跫鱇")
+ ("ro"	"佳箇介解改皆芥開階凱咳慨概蓋鎧個丐个价剴愾懈揩楷漑疥盖觧")
+ ("ror"	"客喀")
+ ("rod"	"坑更粳羹羮鏗")
+ ("ri"	"茄")
+ ("rir"	"醵")
+ ("rj"	"去居巨拒拠渠距鋸車据裾俥倨墟據擧舉欅炬秬筥苣踞遽醵鉅")
+ ("rjs"	"乾巾件健建鍵愆搴腱虔謇蹇騫")
+ ("rjf"	"渇掲傑乞担桝偈杰桀气竭")
+ ("rja"	"柑倹剣検鹸儉劍劔劒剱檢瞼臉黔")
+ ("rjq"	"笈怯劫拾刧")
+ ("rp"	"憩掲偈憇碣")
+ ("rur"	"仮格隔革撃激假挌檄膈茖覡闃骼鬲鴃鵙")
+ ("rus"	"樫鰹堅牽犬絹肩見遣縛繭鑓俔幵悁枅狷甄筧羂譴鵑")
+ ("ruf"	"桔契決潔結訣孟决抉拮挈缺髻")
+ ("rua"	"鎌兼謙慊拑歉箝蒹鉗")
+ ("ruq"	"恰頬慊鋏")
+ ("rud"	"京競卿境鏡驚傾径慶敬景経茎荊警軽頚鯨庚更梗硬耕頃亰竸冂冏剄勁勍哽徑憬檠煢瓊畊痙磬絅經綮耿脛莖謦輕逕竟頸黥")
+ ("rP"	"戒械界階季係啓契桂渓稽系継繋計鶏堺届屆彑悸枅溪畍癸禊笄綮繼薊誡谿髻鷄")
+ ("rh"	"苦古固姑孤庫故枯袴股菰鈷雇顧鼓稿考膏高拷告皐縞尻叩藁估凅刳呱攷敲杲柧桍栲槁槹沽痼皋睾瞽稾箍罟羔胯蛄蠱觚詁誥賈辜錮靠鴣鵁皷")
+ ("rhr"	"曲告穀酷鵠谷硲哭斛梏槲轂髷")
+ ("rhs"	"困坤昆梱混壼崑悃棍滾菎褌鯀鯤鶤")
+ ("rhf"	"滑骨榾汨鶻")
+ ("rhd"	"供共恐恭空公功孔工控攻貢倥廾拱椌槓箜蚣蛩蛬跫鞏")
+ ("rhk"	"瓜寡科果菓課過袴誇跨鍋堝夥夸戈胯萪蝌裹踝顆")
+ ("rhkr"	"廓郭擴攫椁槨癨矍钁霍")
+ ("rhks"	"冠官寛慣棺款潅管莞観貫関館舘串菅丱冦毋灌盥綸綰罐觀鑵關鸛")
+ ("rhkf"	"括活筈桧刮檜聒")
+ ("rhkd"	"拡匡狂光広鉱砿壙廣擴曠昿框洸礦筐筺絋絖胱誑鑛")
+ ("rho"	"掛卦罫咼戈挂枴褂")
+ ("rhl"	"会塊壊怪恢拐魁乖傀壞恠愧槐瑰詼")
+ ("rhlr"	"膕馘")
+ ("rhld"	"宏紘肱轟浤軣鍠")
+ ("ry"	"撹覚較噛糾僑叫喬教橋矯蕎交佼孝巧校絞郊酵鮫招咬嬌攪敲橇澆狡皎磽窖翹膠蛟轎釖餃驕驍")
+ ("rn"	"臼厩欧殴鴎鈎亀丘久仇救求灸球究旧拒九倶句区狗玖矩躯駆駈駒具粂勾口垢拘構溝購叩韮鳩釦傴冓劬區咎嘔媾嫗寇嶇廐廏怐惧懼扣搆柩枸歐毆毬甌疚瞿窶篝舅舊苟蒟蚯衢裘覯詬謳逑遘邱鉤韭颶馗驅鬮齲龜")
+ ("rnr"	"掬菊鞠局麹国囗國椈鬻鞫跼")
+ ("rns"	"君群軍郡桾皸皹窘羣裙")
+ ("rnf"	"屈掘窟堀倔厥崛")
+ ("rnd"	"宮弓窮穹躬")
+ ("rnjs"	"勧巻挙倦券圏拳捲権劵勸卷圈惓椦權眷綣蜷顴")
+ ("rnjf"	"掘蕨亅厥獗蹶闕")
+ ("rnp"	"机帰軌凧潰几匱椢櫃歸皈簣臾詭跪蹶餽饋")
+ ("rnl"	"帰貴鬼亀喟椢歸皈龜")
+ ("rnlr"	"掴幗")
+ ("rb"	"葵窺規糾叫九圭珪頃槻奎揆摎樛癸硅竅糺繆袿赳逵閨馗鬮")
+ ("rbs"	"亀均菌箘鈞麕龜")
+ ("rbf"	"橘")
+ ("rmr"	"可革極劇戟隙克亟剋尅屐棘蕀郤")
+ ("rms"	"僅勤巾斤筋芹謹近根懃槿瑾矜菫覲釿饉")
+ ("rmf"	"契訖")
+ ("rma"	"錦琴禁禽衿襟金檎今噤擒衾黔")
+ ("rmq"	"扱及急汲笈級給岌")
+ ("rmd"	"恒肯亙亘兢恆矜")
+ ("rl"	"磯企伎器基奇寄岐幾忌旗既期棋棄機気汽畿祈紀記起飢騎妓技欺祇居祁己碁乞崎埼碕示其肌鰭箕亟俟冀剞嗜噐圻竒嵜弃掎旡曁朞杞枳棊榿气氣沂淇畸祺稘綺羈羇耆覊覬譏豈跂饑騏驥鮨麒")
+ ("rlr"	"喫")
+ ("rls"	"緊")
+ ("rlf"	"吉桔詰佶拮")
+ ("rla"	"金")
+ ("Rlr"	"喫")
+ ("sk"	"奈那難儺娜懦扨拏拿梛糯")
+ ("skr"	"諾")
+ ("sks"	"暖難攤煖赧")
+ ("skf"	"捺捏涅")
+ ("ska"	"男南楠喃娚遖")
+ ("skq"	"納衲")
+ ("skd"	"嚢娘曩")
+ ("so"	"耐奈内匂乃廼能迺")
+ ("sid"	"嬢孃")
+ ("su"	"女拏拿茹")
+ ("sus"	"年撚碾輾")
+ ("suf"	"捏涅")
+ ("sua"	"念恬拈棯")
+ ("suq"	"摂捻攝躡鑷")
+ ("sud"	"寧嚀濘獰聹")
+ ("sP"	"禰昵")
+ ("sh"	"努奴怒脳呶孥帑弩瑙碯腦臑駑")
+ ("shd"	"濃膿農儂")
+ ("shk"	"雫")
+ ("shl"	"悩脳惱腦餒")
+ ("sy"	"溺尿嫋撓橈鐃閙鬧")
+ ("sn"	"耨")
+ ("sns"	"嫩")
+ ("snf"	"吶肭訥")
+ ("sb"	"紐忸狃鈕")
+ ("sbr"	"忸衄衂")
+ ("smd"	"能")
+ ("sl"	"泥尼禰祢怩濔瀰膩")
+ ("slr"	"溺匿")
+ ("slf"	"尼怩昵")
+ ("sla"	"賃恁")
+ ("ek"	"多大茶夛")
+ ("eks"	"円但丹単担旦短端箪胆蛋鍛団壇断檀段椴敦亶單團彖愽慱斷槫湍猯疸緞葮蜑袒襌褝鄲鶉")
+ ("ekf"	"達咄妲怛撻燵獺逹闥靼韃")
+ ("eka"	"担淡湛耽談曇啖啗壜憺擔毯潭澹痰眈膽蕁覃譚餤")
+ ("ekq"	"沓搭答踏剳荅")
+ ("ekd"	"党唐塘当糖堂撞儻幢档棠溏當瞠礑螳蟷襠鐺黨")
+ ("eo"	"碓対岱帯待戴袋貸隊黛代大敦垈對帶擡抬玳臺薹鐓隶")
+ ("ejr"	"徳悳")
+ ("eh"	"稲図挑跳堵塗屠徒渡菟賭途都鍍度倒刀島嶋悼桃梼盗淘涛祷到逃陶導萄道叨圖嶌掏掉搗擣朷檮棹櫂盜濤滔睹稻絛綢綯纛荼莵覩跿蹈迯闍韜饕")
+ ("ehr"	"竺涜督禿篤毒独読牘犢獨纛讀髑黷")
+ ("ehs"	"純噸惇敦沌豚遁頓暾燉瓲遯飩")
+ ("ehf"	"突頓咄柮")
+ ("ehd"	"諌桐冬凍東棟董働動同憧洞瞳童胴銅僮橦潼疼粡艟苳鮗鶇鼕")
+ ("en"	"吋兜逗斗杜土痘豆頭読亠抖竇肚荳蚪蠹蠧讀酘鬥")
+ ("ens"	"屯遁頓鈍臀遯")
+ ("emr"	"得")
+ ("emd"	"登灯燈等藤謄鐙騰嶝橙滕疼磴籐籘縢")
+ ("fk"	"刺羅螺裸喇懶瘰癩蘿邏鑼陏騾")
+ ("fkr"	"格楽洛絡落酪咯樂烙犖珞駱")
+ ("fks"	"乱卵欄蘭亂嬾欒瀾燗爛襴鑾闌鸞")
+ ("fkf"	"剌喇埒埓糲辣")
+ ("fka"	"嵐濫藍覧儖婪攬欖籃繿纜襤覽醂")
+ ("fkq"	"摺蝋拉柆臘臈鑞")
+ ("fkd"	"滝瀧廊朗榔浪狼郎朖琅瑯莨螂跟踉")
+ ("fo"	"來徠")
+ ("fod"	"冷")
+ ("fir"	"掠略擽畧")
+ ("fid"	"椋掠亮両梁涼糧良諒量倆兩凉喨粱粮裲跟踉輛輌魎")
+ ("fu"	"芦蛎砺麿侶慮旅励麗呂録儷勵唳廬梠櫚犂犁癘礪糲絽綟膂臚茘藜蘆蠣蠡鑢閭驢驪")
+ ("fur"	"力暦歴屶朸櫟檪櫪瀝癧礫轢轣靂鬲")
+ ("fus"	"怜零恋憐漣煉練聯蓮連錬嗹戀揀攣楝聨臠輦鏈鰊")
+ ("fuf"	"列劣烈裂冽捩洌")
+ ("fua"	"鎌廉簾匳奩斂濂瀲")
+ ("fuq"	"猟獵鬣")
+ ("fud"	"領令伶嶺怜玲苓鈴零霊齢囹櫺澪羚聆蛉靈鴒齡")
+ ("fP"	"豊例礼隷禮茘醴隸鱧")
+ ("fh"	"芦鷺櫨蕗虜魯櫓炉賂路露労牢老勞咾撈枦滷潦濾瀘爐癆盧艪艫舮蘆輅轤鑪鈩顱驢鱸鹵")
+ ("fhr"	"角漉鹿谷緑麓禄録梺碌祿轆")
+ ("fhs"	"論淪")
+ ("fhd"	"滝瀧竜龍弄篭聾哢垰壟朧槞瓏籠蘢隴")
+ ("fhl"	"瀬頼雷塁賂儡壘擂櫑癩磊籟罍耒蕾藾誄賚")
+ ("fy"	"了僚寮料療瞭遼寥廖撩暸燎繚聊蓼醪鐐鷯")
+ ("fyd"	"竜龍蘢")
+ ("fn"	"屡涙累婁楼漏僂樓犂犁瘻簍縷縲螻褸鏤陋髏")
+ ("fnl"	"涙泪")
+ ("fb"	"謬柳劉流溜琉留硫瑠塁累類勠嚠壘廖旒榴泪瀏璢瘤繆縲茆鉚鏐霤餾")
+ ("fbr"	"陸六勠戮蓼")
+ ("fbs"	"倫輪論侖崙崘棆淪綸")
+ ("fbf"	"栗律率葎慄篥")
+ ("fbd"	"隆嶐窿")
+ ("fmr"	"肋仂勒")
+ ("fma"	"凛廩懍菻")
+ ("fmd"	"綾菱睦凌稜陵崚楞蔆薐")
+ ("fl"	"浬鯉糎狸提哩利吏履李梨理璃痢裏裡里離厘麗俚俐悧罹漓犂犁竰籬羸莅莉蜊蠡詈貍釐驪魑鯏黐")
+ ("fls"	"燐隣鱗麟吝悋藺躙躪鄰")
+ ("fla"	"林淋琳臨痳霖")
+ ("flq"	"笠立粒苙")
+ ("ak"	"罵馬摩磨魔麻嘛媽麼瑪痲碼蟇蟆")
+ ("akr"	"漠莫貌幕膜摸寞藐")
+ ("aks"	"鰻挽晩蛮娩万慢満漫蔓湾卍曼巒幔彎弯懣滿灣瞞縵萬蠻謾蹣輓鏝饅鬘")
+ ("akf"	"抹末沫眛秣茉襪靺韈")
+ ("akd"	"亡忘忙望妄網惘网罔芒茫莽蠎蟒鋩魍")
+ ("ao"	"罵媒梅楳煤買売呆某埋妹昧枚毎魅寐瑁苺莓賣邁霾")
+ ("aor"	"莫麦百脈獏脉貊貘陌驀麥")
+ ("aod"	"虻萌盟猛盲儚氓甍萠黽")
+ ("aur"	"冖冪幎汨羃覓")
+ ("aus"	"勉眠免棉綿緬面麺俛冕宀湎眄瞑緜麪")
+ ("auf"	"蔑滅")
+ ("aud"	"皿冥名命明銘鳴暝榠溟瞑茗螟酩黽")
+ ("aP"	"袂")
+ ("ah"	"姥牡茅莫侮募墓慕暮母帽某冒謀貌鉾膜粍牟矛摸模毛耗姆旄獏瑁瓱皃眸竓糢耄冐莽謨髦鴾")
+ ("ahr"	"匹牧穆木目凩朷沐繆苜鶩")
+ ("ahf"	"没勿歿沒")
+ ("ahd"	"夢蒙冢梦曚朦檬濛矇艨")
+ ("ay"	"卯畝猫廟描秒苗錨墓妙杳昴渺眇緲茆藐")
+ ("an"	"畝謬撫武舞蕪戊母亡某謀貿務無牟矛霧鵡茂姆巫廡憮懋拇无楙眸繆莽袤誣")
+ ("anr"	"冒墨万黙默冐")
+ ("ans"	"蚊吻文聞娩免問紋門匁們刎悗懣捫紊")
+ ("anf"	"物勿")
+ ("al"	"梶謎尾微眉美米味未迷弥媚嵋弭彌濔瀰糜縻薇躾麋靡黴")
+ ("als"	"敏民悶岷愍憫旻泯緡罠閔黽")
+ ("alf"	"密蜜樒謐")
+ ("qkr"	"狛剥博拍泊箔粕舶薄迫爆駁簿撲朴亳搏摶樸溥珀璞膊雹駮魄鰒")
+ ("qks"	"伴半反叛搬斑班畔繁般頒飯盤磐扮返弁拌攀槃潘瘢竝絆胖蟠襷蹣")
+ ("qkf"	"鉢溌発醗髪抜勃孛悖拔撥渤癶發秡跋髮魃")
+ ("qkd"	"倣放方芳訪邦傍坊妨房棒紡肪防匚厖尨幇彭彷旁枋榜滂磅竝膀舫蒡蚌謗錺髣魴")
+ ("qo"	"俳拝排杯盃背輩配倍培賠陪白北坏徘憊拜湃焙琲胚裴")
+ ("qor"	"栢覇伯拍柏白舶百佰帛霸珀瓸竡粨魄")
+ ("qjs"	"幡反繁藩煩番蕃翻旛旙樊潘燔礬繙飜膰袢鐇鷭")
+ ("qjf"	"伐罰筏閥罸")
+ ("qja"	"帆氾汎犯範凡梵泛笵范")
+ ("qjq"	"法琺")
+ ("qur"	"副幅僻壁癖碧劈擘檗璧甓薜襞躄辟闢霹")
+ ("qus"	"釆変編辺便弁来辨卞扁抃變汳辮胼褊諞辯邊邉駢")
+ ("quf"	"批閉別瞥丿暼鼈")
+ ("qud"	"病浜瓶丙併兵柄並餅屏并枋榜炳秉竝絣迸餠駢")
+ ("qh"	"捗鴇埠普父譜保歩甫補輔菩報宝堡寶寳葆褓鞴黼")
+ ("qhr"	"伏副復幅服福腹複覆僕卜撲匐攴攵樸殕濮箙茯蔔蝠蝮袱蹼輻輹馥鰒")
+ ("qhs"	"本夲賁")
+ ("qhd"	"逢汎封俸奉峰峯捧縫蓬蜂鋒鳳棒泛烽笂篷")
+ ("qn"	"釜缶蔀専培否不付埠夫婦富冨府扶敷斧浮父符腐膚芙負賦赴阜附撫部伏副復複覆簿報剖仆俘俯傅咐嘸坿孚孵抔拊枹柎桴榑殕溥罘腑艀苻蜉訃賻趺輻郛釡鳧鳬麩麸黼")
+ ("qnr"	"北")
+ ("qns"	"体頒匪分噴墳憤扮焚奮粉糞紛雰奔盆吩忿枌氛汾濆犇瓰畚竕笨芬賁")
+ ("qnf"	"不弗払沸仏佛彿怫拂朏狒祓髴黻")
+ ("qnd"	"棚鮒崩朋鵬堋弸硼繃")
+ ("qmr"	"匐")
+ ("ql"	"轡匪卑否妃庇悲扉批斐比泌碑秘緋肥誹費非飛備枇毘琵鼻沸箆丕俾匕嚊妣婢屁憊朏榧狒痞痺睥砒祕秕篦粃糒紕羆翡脾腓臂菲蓖蜚裨譬貔豼賁贔鄙隗霏鞁鞴髀鯡")
+ ("qls"	"鋲彬斌瀕貧賓頻牝嬪擯檳殯濱繽蘋顰鬢")
+ ("qld"	"氷冫冰凭娉憑聘馮騁")
+ ("tk"	"卸献些唆沙砂詐鎖裟咋仕伺使司史嗣四士師思斯死獅私糸詞賜飼事似寺璽辞舎写射捨赦斜社紗謝蛇邪食笥乍覗巳蓑貰亊俟冩厶嗄奢娑寫徙柤梭槎泗洒渣瀉灑犧獻畭祀祠竢篩簑簔絲耜肆舍莎乕辭釶鉈駟駛鯊鰤麝")
+ ("tkr"	"削朔索数嗽數槊爍鑠")
+ ("tks"	"傘山撒散珊産算酸蒜刪杣汕疝繖跚閂閊")
+ ("tkf"	"殺薩撒蔡")
+ ("tka"	"三参森杉參彡滲糂纔罧芟蔘衫")
+ ("tkq"	"扱渋挿插歃澁澀霎颯")
+ ("tkd"	"桑向傷償商嘗尚床湘祥裳詳象賞上常状双喪爽想相霜像滝瀧湯峠橡箱様雙嫦孀庠廂慯樣殤牀甞翔裃觴謫鱶")
+ ("to"	"塞璽洒灑腮賽顋鰓")
+ ("tor"	"塞咋索色嗇愬槭穡薔")
+ ("tod"	"甥省牲生猩笙")
+ ("tid"	"餉")
+ ("tj"	"黍犀暑曙庶緒署書薯藷叙序徐恕鋤瑞棲栖西誓逝鼠挑婿舒噬墅壻嶼抒敍敘筮絮耡聟胥黎鼡")
+ ("tjr"	"潟汐射釈錫席惜昔析石碩夕淅皙蓆蜥螫裼釋鉐")
+ ("tjs"	"還蝉仙先宣扇撰洗煽旋線羨腺船選銑鮮善禅繕膳単亘僊單嬋尠愃洒燹癬禪綫譱舩蘚跣霰")
+ ("tjf"	"洩屑契折設説雪舌鱈苫囓挈楔泄渫紲絏緤薛褻齧")
+ ("tja"	"繊閃孅暹歙殲殱笘纖纎蟾譫贍銛")
+ ("tjq"	"拾渉摺摂燮囁慴懾攝聶躡鑷顳")
+ ("tjd"	"省城姓性成星盛聖声誠醒惺晟猩筬聲腥")
+ ("tp"	"歳細笹世勢税説洗貰彗洒蛻")
+ ("th"	"鯵繰咲篠所召哨宵小少昭梢沼消焼硝笑紹肖鞘塑疏疎素蘇訴遡掃掻巣燥騒蛸疋劭嘯嫂愬梳樔毟泝溯瀟燒甦筱簫艘蔬蕭蘓譟踈逍邵釖銷霄韶騷鮹鰺")
+ ("thr"	"粟束速俗属続屬續謖贖")
+ ("ths"	"餐孫損遜巽")
+ ("thf"	"率蟀")
+ ("thd"	"松訟宋送悚枩淞竦舂蚣誦鎹頌鬆")
+ ("thkf"	"刷")
+ ("tho"	"鎖砕刷殺晒洒灑瑣碎")
+ ("thl"	"粋衰夊")
+ ("tn"	"守手殊狩首受寿授樹綬需囚収修愁秀繍蒐讐酬獣宿須垂帥水睡遂随瑞髄数捜痩袖竪誰嬬穂薮輸率叟售嗾嗽埀壽嫂岫戍搜收數殳泅洙溲漱燧獸祟穗籔粹綉綏繻羞脩隋膸茱莎蓚藪雖讎豎隨酥銖銹鏥陲隧髓鬚")
+ ("tnr"	"叔夙宿淑縮粛塾熟俶孰倏肅菽蓿")
+ ("tns"	"瞬舜駿循旬楯殉淳盾純巡醇順馴徇恂洵筍笋脣荀蓴蕣詢諄鐓鶉")
+ ("tnf"	"術述率恤戌朮")
+ ("tnd"	"崇嵩菘")
+ ("tnl"	"倅伜淬")
+ ("tmf"	"膝瑟虱蝨")
+ ("tmq"	"湿拾習襲濕褶隰")
+ ("tmd"	"勝升承昇丞乗剰僧縄蝿乘剩甸枡繩蠅陞")
+ ("tl"	"飴柿匙殺使始屍市施視詩試侍寺時示蒔偲柴是提矢厮啻嗜嘶尸屎廝弑恃撕猜翅腮舐葹蓍諡豕豺顋")
+ ("tlr"	"喰式識埴飾拭植殖食蝕息寔熄軾餝")
+ ("tls"	"榊伸信娠慎新申神紳臣薪身辛腎訊迅辰矧噺呻哂宸愼抻晨燼蜃贐頤鰰")
+ ("tlf"	"失室悉実實榁蟋")
+ ("tla"	"参審心深芯尋甚參忱椹沁潯瀋蕈鐔")
+ ("tlq"	"拾什十渋辻卅丗澁澀瓧竍籵")
+ ("Tkd"	"双雙")
+ ("Tl"	"氏")
+ ("dk"	"亜唖阿俄峨我牙芽蛾雅餓涯御児亞兒哦娥婀峩椏猗痾莪衙襾訝錏鐚鴉鵝鵞")
+ ("dkr"	"亜悪握渥岳楽顎鍔鰐亞咢堊嶽幄惡愕樂萼蕚葯諤鄂鶚齷齶")
+ ("dks"	"安按案鞍岸眼贋雁顔諺偐晏殷顏鮟鴈鳫")
+ ("dkf"	"斡按謁戛戞蘗蘖歹訐軋遏閼靄")
+ ("dka"	"庵暗闇厭俺巌癌岩嵒巖菴諳頷黯黶")
+ ("dkq"	"姶圧押鴨哈壓狎")
+ ("dkd"	"央仰昂怏殃泱秧鞅鴦")
+ ("do"	"哀愛挨崖涯碍喝啀嗄噫埃崕曖欸皚睚瞹磑礙艾藹阨隘靄靉饐")
+ ("dor"	"液額夜厄扼掖腋軛阨隘")
+ ("dod"	"嚶櫻罌鶯鸚")
+ ("di"	"射斜邪若惹埜也冶夜爺耶野揶椰鵺")
+ ("dir"	"鰯若弱約薬躍嫋搦籥葯蒻藥鑰鶸龠")
+ ("did"	"詳壌嬢穣譲醸揚楊様洋羊陽養佯壤孃恙攘昜暘樣漾瀁煬痒瘍癢禳穰襄讓釀驤")
+ ("dj"	"於漁禦魚御語唹圄圉淤飫馭鯲齬")
+ ("djr"	"億憶臆疑抑檍")
+ ("djs"	"堰言諺這彦偃嫣焉篶")
+ ("djf"	"蘗蘖")
+ ("dja"	"奄掩俺巌岩験厳儼厂嚴巖广淹罨閹驗")
+ ("djq"	"業")
+ ("dp"	"恚殪")
+ ("du"	"汝如予余与誉輿預豫歟洳畭絮舁與茹蕷蜍譽餘")
+ ("dur"	"易域疫駅逆射亦役訳懌繹蜴譯閠閾霓驛鯣")
+ ("dus"	"咽宴延沿演煙燕縁鉛研硯次然鳶軟燃淵吮嚥妍娟悁捐掾椽櫞衍涓涎渊烟筵臙莚蜒蠕讌")
+ ("duf"	"咽悦閲説熱吶噎齧")
+ ("dua"	"厭炎焔艶塩染稔冉檐艷苒閻髯魘鯰鹽黶")
+ ("duq"	"厭葉囁曄靨")
+ ("dud"	"営嬰影映栄永泳瑛盈穎頴英詠景迎咏營塋佞侫暎楹榮潁瀛瑩瓔珱纓蠑贏郢霙")
+ ("dP"	"医叡曳洩鋭刈詣芸児蕊誉預乂豫倪兒兌囈曵泄猊睨睿穢翳艾蘂蕋藝蚋裔譽貎霓鯢麑")
+ ("dh"	"悪烏迂於汚奥襖五伍午呉吾娯悟梧誤傲唔嗚嗷塢墺奧媼寤忤惡懊敖晤澳熬燠牾珸蜈螯遨鏖鰲鼇")
+ ("dhr"	"阿屋玉獄沃")
+ ("dhs"	"温穏慍瘟穩薀蘊褞鰮鰛")
+ ("dhf"	"兀榲膃")
+ ("dhd"	"翁擁壅廱瓮甕癰禺蓊雍鶲")
+ ("dhk"	"娃渦臥蛙瓦窪哇囮窩萵蝸訛譌")
+ ("dhks"	"宛完緩莞関玩翫頑椀碗腕婉浣澣蜿豌關")
+ ("dhkf"	"曰")
+ ("dhkd"	"往旺王皇尢徃枉汪")
+ ("dho"	"娃蛙倭哇矮蝸")
+ ("dhl"	"畏外隈嵬巍猥磑薈鮠")
+ ("dy"	"凹楽尭腰擾銚陶約妖揺曜窯耀要謡遥僥夭姚嬲嫐嶢幺徭徼拗搖撓樂橈殀澆燿瑶窈窰繞蕘蟯謠遶邀饒鷂堯遙瑤")
+ ("dyr"	"辱谷慾欲浴峪溽縟蓐褥")
+ ("dyd"	"桶茸勇湧涌傭容庸溶熔用蓉踊俑慂慵榕甬聳舂蛹踴鎔頌")
+ ("dn"	"芋右宇羽迂雨欧殴牛区愚虞偶寓遇隅枢又尤佑優友憂祐郵于傴吁吽嵎樞歐毆疣盂禹禺紆肬藕謳麌齲")
+ ("dnr"	"旭郁勗墺澳燠")
+ ("dns"	"員韻云運雲暈殞熕紜耘隕韵")
+ ("dnf"	"宛尉欝蔚鬱熨")
+ ("dnd"	"熊雄")
+ ("dnjs"	"宛員院園怨援猿苑薗遠鴛垣願元原源媛冤圓圜婉寃愿湲爰芫蜿袁諢轅鋺阮隕")
+ ("dnjf"	"越月戉曰粤鉞")
+ ("dnl"	"葦位偉囲委威尉慰為緯胃萎謂違蔚衛危偽倭僞喟囗圍幃渭爲痿縅莠蝟衞逶韋魏")
+ ("db"	"惟維遺桜儒柔嬬酉楢肉乳濡鮪愉愈油癒諭輸唯宥幽悠有柚猶猷由裕誘遊幼侑兪喩囿孺帷懦揉揄攸楡渝游瑜瘉糅綏腴臾萸蕕蚰蝓蝣蠕襦覦諛蹂踰逾釉鍮鞣黝鼬")
+ ("dbr"	"育粥肉囿毓鬻")
+ ("dbs"	"允胤閏潤尹贇酳")
+ ("dbf"	"聿鴪")
+ ("dbd"	"戎融絨")
+ ("dms"	"隠恩銀听圻垠慇憖殷犹隱齦")
+ ("dmf"	"乙疑")
+ ("dma"	"飲淫蔭陰音疑吟吽婬崟飮霪")
+ ("dmq"	"泣揖邑悒")
+ ("dmd"	"応疑凝鷹蝿應膺蠅軅軈")
+ ("dml"	"依意椅衣涯毅儀宜擬疑義蟻誼議歪倚崕嶬嶷懿欹熨猗矣礒縊艤醫饐")
+ ("dl"	"飴以伊夷易異移餌施爾而耳蛇食詑台弛寅二迩弍姨尓已彝彜怡洟珥甅痍肄苡詒貽貳貮轜邇隶")
+ ("dlr"	"益翌翼嶷弋杙翊謚鷁")
+ ("dls"	"印咽因姻引煙人仁刃靭寅忍認籾仞仭儿刄堙孕廴氤湮烟茵荵蚓靱")
+ ("dlf"	"一壱溢逸日弌佚壹衵釼鎰")
+ ("dla"	"荏壬賃任妊稔姙恁衽袵")
+ ("dlq"	"込廿入叺圦鳰")
+ ("dld"	"剰仍剩孕")
+ ("wk"	"梓茨佐左査剤作仔刺姉姿子孜紫諮資雌字慈滋磁自煮者斉積柘髭偖劑呰咨孳恣滓炙瓷疵眥眦粢苴茲蔗藉薺觜貲齎赭鮓鷓齊")
+ ("wkr"	"作昨勺杓灼爵酌酢雀嚼妁寉斫柞炸筰綽芍醋鵲")
+ ("wks"	"桟残孱戔棧殘潺盞")
+ ("wka"	"蚕暫潜湛岑潛濳箴簪蠶賺鏨")
+ ("wkq"	"雑匝挿喋囃插箚襍雜")
+ ("wkd"	"匠奨将庄掌樟章粧蒋醤障丈場杖状壮荘葬装臓蔵帳張腸長撞仗塲墻壯奘奬妝將嶂弉橦檣淙漿爿牆獎璋瘴膓臟臧艢莊萇薔藏裝贓賍鏘鱆")
+ ("wo"	"再哉宰才災斎裁載在材財柴斉存滓齋縡纔豺齎齊")
+ ("wod"	"噌槍争鎗崢幀爭瞠箏筝諍錚")
+ ("wj"	"姐且杵煮渚藷諸鋤除岨狙樗瀦猪苧著貯低底抵邸屠這箸儲佇咀弖抒杼柢楮沮潴牴疽砠竚紵羝耡苴蛆觝詆豬躇雎齟")
+ ("wjr"	"荻借寂積籍績赤跡蹟賊逐嫡弔吊摘敵滴的笛適鏑躍勣廸炙狄癪磧糴芍藉覿迪迹逖")
+ ("wjs"	"鴫竣戦栓栴煎箭詮銭前全揃樽佃典填展纏転顛伝殿澱田電縛畑槙淀傳剪甸吮囀奠專巓廛悛戔戰畋旃氈沺濺牋甎痊癜癲磚筌箋篆纒羶翦腆趁躔輾轉鈿銓錢鐫雋靦顫餞饌鷆鷏槇")
+ ("wjf"	"準切拙折窃節絶窒姪凖卩咥截晢晰浙竊耋跌軼")
+ ("wja"	"鮎占漸店点苫粘岾簟霑黏點")
+ ("wjq"	"接蝶慴椄楫楪沾渫聶鰈")
+ ("wjd"	"井鯖晶証鉦情浄錠征政整正精静打丁町頂亭停偵貞呈定庭廷挺汀碇禎程艇訂鄭釘鼎瀞柾靖淀丼叮幀掟旌梃淨渟甼疔睛穽聢菁蟶逞遉酊酲鐺霆靜")
+ ("wp"	"鵜栽済祭際剤諸除制製斉折第醍題堤帝弟悌提梯蹄俤儕劑擠晢濟眥眦睇臍薺齎躋霽齏韲齊")
+ ("wh"	"竃繰錯惨篠助昭照詔条岨措祖租粗組阻操早曹槽漕燥糟藻遭造鯛兆凋弔彫朝潮眺調跳銚鳥蔦爪吊釣敦蚤肇佻俎嘲噪徂慘慥懆找抓晁條梍棗棹澡爼砠祚稠窕竈笊糶絛罩耡胙艚蜩詛誂譟趙躁鑿雕髞")
+ ("whr"	"足族簇蔟鏃")
+ ("whs"	"尊拵")
+ ("whf"	"拙卒枠卆猝")
+ ("whd"	"種腫宗終従縦鍾鐘綜柊从從慫棕椶樅淙粽縱螽踵蹤踪鑁")
+ ("whk"	"佐左坐座挫")
+ ("whl"	"罪")
+ ("wy"	"釖")
+ ("wn"	"株作主朱珠酒呪周州洲舟週住祝厨奏走足族宙昼柱注註酎鋳駐調紬肘湊丶侏做儔冑嗾廚晝疇畴稠籌籀紂綢胄蔟蛛誅赱躊輳遒鑄麈")
+ ("wnr"	"粥竹鬻")
+ ("wns"	"噂俊峻竣駿準純遵屯隼鱒儁凖墫恂悛惷浚濬皴蠢蹲逡")
+ ("wnd"	"衆重中仲")
+ ("wmr"	"即賊")
+ ("wmf"	"櫛")
+ ("wma"	"怎")
+ ("wmq"	"輯汁葺揖楫緝")
+ ("wmd"	"絵甑症証蒸噌曾曽増憎贈徴拯橙烝證")
+ ("wl"	"岐祇志指支旨枝止祉紙肢脂至誌持識質芝織只知地智池蜘遅漬底抵砥之咫址塒帋弖摯枳沚痣祗耆胝舐觝貭贄趾踟躓輊遲阯鮨鷙")
+ ("wlr"	"織職直喞稙稷")
+ ("wls"	"唇振晋榛疹真秦診進震塵尽陣辰珍鎮陳津填賑侭儘嗔晉殄燼珎甄畛盡眞瞋縉臻蓁袗趁軫鎭")
+ ("wlf"	"叱嫉疾質秩窒迭蛭姪佚咥喞垤帙桎耋膣腟貭跌軼")
+ ("wla"	"朕斟酖鴆")
+ ("wlq"	"執輯集汁緝")
+ ("wld"	"澄徴懲澂")
+ ("ck"	"且此叉嵯差瑳車遮借詫侘嗟岔嵳扠搓朿槎磋箚苴蹉釵")
+ ("ckr"	"搾窄錯昔捉濁着著戳縒躇鑿齣齪")
+ ("cks"	"燦纂讃賛餐撰簒攅爨竄粲纉讚贊鏨鑽鑚饌")
+ ("ckf"	"察拶擦札刹扎獺紮")
+ ("cka"	"参惨斬漸僭僣參塹嶄巉慘慙慚懺懴槧站譖譛讒讖驂")
+ ("ckd"	"唱娼廠彰昌菖椙創倉槍窓蒼暢脹畠倡剏厰悵愴搶敞昶淌滄漲猖瘡窗艙蹌鬯")
+ ("co"	"差債彩採采砦祭菜柴責莱寨綵蔡豸釵靫")
+ ("cor"	"咋柵窄策冊責措册嘖拆柞磔筴簀")
+ ("cj"	"妻処凄狙處悽淒絮萋")
+ ("cjr"	"刺尺隻戚斥脊捗剔呎彳擲滌瘠蜴跖蹐蹠躑陟鶺")
+ ("cjs"	"茜粁串釧蚕千川撰泉浅穿舛薦賎践遷辿天仟倩刋喘巛擅栫楾淺湶濺瓩竏荐賤踐闡阡韆")
+ ("cjf"	"綴哲徹撤轍鉄凸畷啜屮掣輟銕錣鐵鐡餮")
+ ("cja"	"鹸尖添甜僉忝恬槧檐沾瞻簷簽籤籖蟾覘諂譫")
+ ("cjq"	"妾捷畳喋帖牒諜貼疊疉疂睫褶輒輙")
+ ("cjd"	"鯖錆晴清請青庁聴廳廰聽菁蜻")
+ ("cp"	"切体替滞逮綴剃締諦逓薙畷啼嚔嚏掣楴涕滯睇砌蒂蔕裼躰軆遞靆體髢")
+ ("ch"	"鍬初哨抄招樵焦硝礁肖蕉鞘酢楚礎草超銚秒剿劭勦屮峭悄愀憔杪椒湫炒稍艸誚貂迢醋鈔髫鷦齠")
+ ("chr"	"趣嘱燭触数促属囑屬數矗矚簇蜀觸躅鏃髑")
+ ("chs"	"吋寸村忖邨")
+ ("chd"	"従銃叢惣総聡寵塚憧葱竜龍从偬匆從怱愡總縱聰")
+ ("chl"	"催最崔摧榱洒")
+ ("cn"	"穐丑鰍取趣就愁秋臭酋醜出諏推錐錘枢趨雛粗畜抽墜椎槌追鎚萩鷲啾娵婢帚惆掫捶楸樞湫甃皺龝箒簇縋聚芻蒭鄒陬隹鞦騅驟鰌麁")
+ ("cnr"	"丑竺軸蹴祝縮築畜筑蓄逐柚槭舳蹙")
+ ("cns"	"春椿鰆")
+ ("cnf"	"出朮黜")
+ ("cnd"	"沖充銃衝忠虫衷傭冲狆艟蟲")
+ ("cnp"	"悴忰惴瘁萃贅")
+ ("cnl"	"取趣就臭吹炊翠酔脆鷲嘴娶惴揣橇毳瘁翆聚膵萃觜醉驟")
+ ("cmr"	"側則測捗仄惻昃")
+ ("cms"	"齔")
+ ("cma"	"闖")
+ ("cmd"	"曾曽層")
+ ("cl"	"嵯差歯治痔埴植織値恥痴稚置致馳徴直薙侈卮厠嗤夂峙巵幟廁梔熾畄畤癡碪穉笞紕緇緻耻蚩褫豸跂輜錙雉魑鯔鴟鵄黹齒")
+ ("clr"	"則測勅飭厠廁惻敕")
+ ("cls"	"親襯齔")
+ ("clf"	"七漆")
+ ("cla"	"砧侵寝浸針湛沈枕寢忱斟椹鍼鍖闖駸")
+ ("clq"	"蟄")
+ ("cld"	"称秤稱袮騁")
+ ("cho"	"快夬獪")
+ ("xk"	"蛇他詑唾堕妥惰打柁舵楕陀駄騨池詫佗咤墮它捶揣朶橢沱隋躱駝鴕")
+ ("xkr"	"卓啄托拓沢濯琢託鐸濁擢度倬啅拆柝澤鈬魄")
+ ("xks"	"騨嘆坦歎炭綻誕弾呑灘彈憚攤殫袒")
+ ("xkf"	"奪脱")
+ ("xka"	"探耽眈貪")
+ ("xkq"	"塔搭搨榻鞜鞳鰈")
+ ("xkd"	"宕湯糖蕩帑盪蝪")
+ ("xo"	"税太汰怠態泰胎苔逮台大能殆戻兌棣笞紿蛻詒颱駘")
+ ("xor"	"宅択沢擇澤")
+ ("xh"	"兎吐菟土套討兔莵")
+ ("xhs"	"褪")
+ ("xhd"	"桶痛通筒統樋恫慟")
+ ("xhl"	"推堆腿退槌追鎚敦褪頽")
+ ("xn"	"妬投透闘愉偸綉鍮骰鬪")
+ ("xmr"	"貸特慝")
+ ("vk"	"頗巴把播杷波派琶破婆芭罷簸坡怕擺霸爬玻碆笆耙膰菠葩袙跛陂")
+ ("vks"	"坂阪判板版販辧汳瓣鈑")
+ ("vkf"	"捌八叭杁釟")
+ ("vo"	"唄貝派敗牌背倍狽抜罷稗佩孛悖拔旆霸沛珮霈")
+ ("vod"	"棚烹傍膨弸彭旁澎磅繃")
+ ("vir"	"愎")
+ ("vus"	"平偏片篇編遍便鞭扁翩苹蝙褊諞騙")
+ ("vua"	"貶")
+ ("vud"	"坪評浜平怦泙硼苹萍鮃")
+ ("vP"	"柿廃肺幣弊蔽閉陛吠嬖幤廢敝斃癈薜髀")
+ ("vh"	"浦鞄蒲曝爆布怖葡舗鋪圃捕包庖抱泡砲胞褒飽暴勹匍匏咆哺垉抛枹瀑炮疱皰脯舖苞袍襃逋鉋靤餔髱鮑鯆麭")
+ ("vhr"	"曝爆幅暴瀑")
+ ("vy"	"杓俵彪標漂瓢票表豹剽嫖慓殍縹飄飃飆驃驫髟鰾")
+ ("vns"	"分")
+ ("vna"	"品稟禀")
+ ("vnd"	"楓風豊瘋諷豐颪馮")
+ ("vb"	"彪")
+ ("vl"	"彼披疲皮罷被避跛辟陂")
+ ("vlf"	"嘩比泌匹疋弼必畢筆払仏佛拂篳譁蹕鵯")
+ ("vlq"	"逼幅乏泛")
+ ("gk"	"下何夏河荷蝦霞賀嚇雫厦呀廈渮瑕緞罅訶谺遐鍜鰕")
+ ("gkr"	"鴬学虐鶴壑學斈涸狢瘧謔貉鷽")
+ ("gks"	"寒汗漢翰閑韓限恨嫺嫻悍扞捍旱桿瀚狠皖罕邯駻骭鼾")
+ ("gkf"	"害割喝轄劼瞎蝎黠")
+ ("gka"	"艦陥含函濫凾咸啣喊嵌檻涵緘莟邯銜陷頷餡鰔鹹")
+ ("gkq"	"蓋閤合蛤呷哈溘盍盖盒葢闔鴿")
+ ("gkd"	"桁巷恒抗杭港航行降項虹亢伉吭恆缸肛閧頏鬨")
+ ("go"	"亥解械海蟹劾咳害該骸鮭偕垓夥奚孩廨懈楷薤蠏觧諧邂醢駭")
+ ("gor"	"劾核硅覈輅")
+ ("god"	"杏倖幸行絎裄鵆")
+ ("gid"	"享郷響饗向香嚮餉")
+ ("gj"	"嘘虚許墟栩歔滸")
+ ("gjs"	"憲献軒掀獻")
+ ("gjf"	"歇蝎蠍")
+ ("gja"	"険験嶮險驗")
+ ("gur"	"嚇赫革恵奕洫鬩")
+ ("gus"	"絢懸県見賢顕弦玄現絃舷項頁俔呟洵痃眩縣蜆衒鉉顯")
+ ("guf"	"穴血冗頁孟孑襭頡")
+ ("gua"	"嫌")
+ ("guq"	"袷叶侠協峡挟狭脅頬脇夾峽慊挾浹狹筴篋莢鋏陜陝")
+ ("gud"	"馨亨刑兄型形荊蛍桁衡夐炯烱瑩脛螢迥")
+ ("gP"	"慧繋兮匸奚彗惠盻禊蹊醯鞋")
+ ("gh"	"穫乎呼弧戸湖狐糊胡虎雇互吾瑚護醐好浩号壕濠豪冴皐縞壷冱壺怙戲昊晧楜毫沍滬滸犒琥瓠皋皓葫蒿虍號蝴扈鎬餬")
+ ("ghr"	"或酷鵠惑寉斛")
+ ("ghs"	"婚昏昆混魂棍棔渾溷焜琿")
+ ("ghf"	"核忽惚歿笏鶻")
+ ("ghq"	"恰")
+ ("ghd"	"弘洪紅鴻哄汞泓訌閧鬨")
+ ("ghk"	"化火禍禾花華貨画椛樺靴樗和話啝崋畫糀錵")
+ ("ghkr"	"拡獲確穫擴攫癨矍蠖霍")
+ ("ghks"	"喚患換桓歓環還丸幻亘圜奐宦寰懽歡渙湲煥皖眩矜讙豢鐶驩鬟鰥")
+ ("ghkf"	"越活滑撮猾磆蛞豁闊濶")
+ ("ghkd"	"黄況兄慌晃皇荒幌况凰徨恍惶晄湟滉煌篁簧肓蝗遑隍鰉")
+ ("gho"	"画罫獪畫")
+ ("ghl"	"会回壊廻悔恢懐晦灰准桧賄會囘匯壞徊懷檜槐淮繪膾茴薈蛔詼誨迴鱠")
+ ("ghlr"	"画劃獲畫")
+ ("ghld"	"横弘衡轟薨軣鍠黌")
+ ("gy"	"暁佼効校酵肴傚哮嚆囂效曉梟淆烋爻驕驍")
+ ("gn"	"芋朽後侯候厚后喉佝吼嗅嘔涸煦猴篌詬逅")
+ ("gns"	"勲薫訓馴勳熏燻葷醺")
+ ("gnd"	"薨")
+ ("gnjs"	"萱喧暖愃暄萓諠讙")
+ ("gnp"	"虫卉喙毀燬")
+ ("gnl"	"揮徽輝彙戲暉麾諱")
+ ("gb"	"休携畦畜攜烋虧貅")
+ ("gbr"	"畜")
+ ("gbf"	"恤譎鷸")
+ ("gbd"	"兇凶胸匈恟洶")
+ ("gmr"	"黒釛")
+ ("gms"	"欣痕很忻掀釁")
+ ("gmf"	"汽吃迄屹訖")
+ ("gma"	"欽欠")
+ ("gmq"	"吸歙洽皀翕")
+ ("gmd"	"興虹")
+ ("gml"	"喜嬉希稀戯犠姫僖咥唏噫愾憙戲晞曦欷煕熈熹燹犧禧羲釐鯑")
+ ("glf"	"詰纈襭頡黠")
+ ("unknown"	"苅宍栂栃凪弐塀俣杢刔夘咒哘唸囎圀圷圸垳垪埔埖埣塰堽墹墸壗壥嬶屓乢妛岫岻岶岼峅峇峺嵶彁怺恷恊抂挧掵擶暃杤桙梹椥椨椪椚椣椡槝樮櫁樌橲樶橸樢檸欟歛汢渕淕溂潸澑犲畉畆畩蘯眤瞶硴碚碵礇禝穃邃笶筅箟篏簓簗籏粐粭粫糘綛縺繧纃緕纐罎膤艝茣莇菷萢蒄蓙蘰蚫蛯蟐袞袰褄諚戝轌辷迚逧逎鍄錻閇閖陦隲靹鞆鞐饂馼駲鮖鮴鯒鯱鰄鰡鱚鵈鵤鵐"))
 
 ;;; hanja-jis.el ends here
diff --git a/lisp/leim/quail/japanese.el b/lisp/leim/quail/japanese.el
index 74f02b141d..d536b5e5c9 100644
--- a/lisp/leim/quail/japanese.el
+++ b/lisp/leim/quail/japanese.el
@@ -1,4 +1,4 @@
-;;; japanese.el --- Quail package for inputting Japanese  -*-coding: iso-2022-7bit;-*-
+;;; japanese.el --- Quail package for inputting Japanese
 
 ;; Copyright (C) 2001-2019 Free Software Foundation, Inc.
 ;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
@@ -31,7 +31,7 @@
 (require 'kkc)
 
 (defvar quail-japanese-use-double-n nil
-  "If non-nil, use type \"nn\" to insert $B$s(B.")
+  "If non-nil, use type \"nn\" to insert ん.")
 
 ;; Update Quail translation region while considering Japanese bizarre
 ;; translation rules.
@@ -47,14 +47,14 @@
 		 (setq quail-current-str (aref quail-current-key 0)
 		       control-flag t))
 		((= (aref quail-current-key 0) ?n)
-		 (setq quail-current-str ?$B$s(B)
+		 (setq quail-current-str ?ん)
 		 (if (and quail-japanese-use-double-n
 			  (> keylen 0)
 			  (= (aref quail-current-key 1) ?n))
 		     (setq control-flag t)))
 		((and (> keylen 1)
 		      (= (aref quail-current-key 0) (aref quail-current-key 1)))
-		 (setq quail-current-str ?$B$C(B))
+		 (setq quail-current-str ?っ))
 		(t
 		 (setq quail-current-str (aref quail-current-key 0))))
 	  (if (integerp control-flag)
@@ -84,10 +84,10 @@
 (defun quail-japanese-kanji-kkc ()
   (interactive)
   (when (= (char-before (overlay-end quail-conv-overlay)) ?n)
-    ;; The last char is `n'.  We had better convert it to `$B$s(B'
+    ;; The last char is `n'.  We had better convert it to `ん'
     ;; before kana-kanji conversion.
     (goto-char (1- (overlay-end quail-conv-overlay)))
-    (insert ?$B$s(B)
+    (insert ?ん)
     (delete-char 1))
   (let* ((from (copy-marker (overlay-start quail-conv-overlay)))
 	 (len (- (overlay-end quail-conv-overlay) from)))
@@ -135,113 +135,113 @@
   (throw 'quail-tag nil))
 
 (defvar quail-japanese-transliteration-rules
-  '(( "a" "$B$"(B") ( "i" "$B$$(B") ( "u" "$B$&(B") ( "e" "$B$((B") ( "o" "$B$*(B")
-    ("ka" "$B$+(B") ("ki" "$B$-(B") ("ku" "$B$/(B") ("ke" "$B$1(B") ("ko" "$B$3(B")
-    ("sa" "$B$5(B") ("si" "$B$7(B") ("su" "$B$9(B") ("se" "$B$;(B") ("so" "$B$=(B")
-    ("ta" "$B$?(B") ("ti" "$B$A(B") ("tu" "$B$D(B") ("te" "$B$F(B") ("to" "$B$H(B")
-    ("na" "$B$J(B") ("ni" "$B$K(B") ("nu" "$B$L(B") ("ne" "$B$M(B") ("no" "$B$N(B")
-    ("ha" "$B$O(B") ("hi" "$B$R(B") ("hu" "$B$U(B") ("he" "$B$X(B") ("ho" "$B$[(B")
-    ("ma" "$B$^(B") ("mi" "$B$_(B") ("mu" "$B$`(B") ("me" "$B$a(B") ("mo" "$B$b(B")
-    ("ya" "$B$d(B")             ("yu" "$B$f(B")             ("yo" "$B$h(B")
-    ("ra" "$B$i(B") ("ri" "$B$j(B") ("ru" "$B$k(B") ("re" "$B$l(B") ("ro" "$B$m(B")
-    ("la" "$B$i(B") ("li" "$B$j(B") ("lu" "$B$k(B") ("le" "$B$l(B") ("lo" "$B$m(B")
-    ("wa" "$B$o(B") ("wi" "$B$p(B") ("wu" "$B$&(B") ("we" "$B$q(B") ("wo" "$B$r(B")
-    ("n'" "$B$s(B")
-    ("ga" "$B$,(B") ("gi" "$B$.(B") ("gu" "$B$0(B") ("ge" "$B$2(B") ("go" "$B$4(B")
-    ("za" "$B$6(B") ("zi" "$B$8(B") ("zu" "$B$:(B") ("ze" "$B$<(B") ("zo" "$B$>(B")
-    ("da" "$B$@(B") ("di" "$B$B(B") ("du" "$B$E(B") ("de" "$B$G(B") ("do" "$B$I(B")
-    ("ba" "$B$P(B") ("bi" "$B$S(B") ("bu" "$B$V(B") ("be" "$B$Y(B") ("bo" "$B$\(B")
-    ("pa" "$B$Q(B") ("pi" "$B$T(B") ("pu" "$B$W(B") ("pe" "$B$Z(B") ("po" "$B$](B")
-
-    ("kya" ["$B$-$c(B"]) ("kyu" ["$B$-$e(B"]) ("kye" ["$B$-$'(B"]) ("kyo" ["$B$-$g(B"])
-    ("sya" ["$B$7$c(B"]) ("syu" ["$B$7$e(B"]) ("sye" ["$B$7$'(B"]) ("syo" ["$B$7$g(B"])
-    ("sha" ["$B$7$c(B"]) ("shu" ["$B$7$e(B"]) ("she" ["$B$7$'(B"]) ("sho" ["$B$7$g(B"])
-    ("cha" ["$B$A$c(B"]) ("chu" ["$B$A$e(B"]) ("che" ["$B$A$'(B"]) ("cho" ["$B$A$g(B"])
-    ("tya" ["$B$A$c(B"]) ("tyu" ["$B$A$e(B"]) ("tye" ["$B$A$'(B"]) ("tyo" ["$B$A$g(B"])
-    ("nya" ["$B$K$c(B"]) ("nyu" ["$B$K$e(B"]) ("nye" ["$B$K$'(B"]) ("nyo" ["$B$K$g(B"])
-    ("hya" ["$B$R$c(B"]) ("hyu" ["$B$R$e(B"]) ("hye" ["$B$R$'(B"]) ("hyo" ["$B$R$g(B"])
-    ("mya" ["$B$_$c(B"]) ("myu" ["$B$_$e(B"]) ("mye" ["$B$_$'(B"]) ("myo" ["$B$_$g(B"])
-    ("rya" ["$B$j$c(B"]) ("ryu" ["$B$j$e(B"]) ("rye" ["$B$j$'(B"]) ("ryo" ["$B$j$g(B"])
-    ("lya" ["$B$j$c(B"]) ("lyu" ["$B$j$e(B"]) ("lye" ["$B$j$'(B"]) ("lyo" ["$B$j$g(B"])
-    ("gya" ["$B$.$c(B"]) ("gyu" ["$B$.$e(B"]) ("gye" ["$B$.$'(B"]) ("gyo" ["$B$.$g(B"])
-    ("zya" ["$B$8$c(B"]) ("zyu" ["$B$8$e(B"]) ("zye" ["$B$8$'(B"]) ("zyo" ["$B$8$g(B"])
-    ("jya" ["$B$8$c(B"]) ("jyu" ["$B$8$e(B"]) ("jye" ["$B$8$'(B"]) ("jyo" ["$B$8$g(B"])
-    ( "ja" ["$B$8$c(B"]) ( "ju" ["$B$8$e(B"]) ( "je" ["$B$8$'(B"]) ( "jo" ["$B$8$g(B"])
-    ("bya" ["$B$S$c(B"]) ("byu" ["$B$S$e(B"]) ("bye" ["$B$S$'(B"]) ("byo" ["$B$S$g(B"])
-    ("pya" ["$B$T$c(B"]) ("pyu" ["$B$T$e(B"]) ("pye" ["$B$T$'(B"]) ("pyo" ["$B$T$g(B"])
-
-    ("kwa" ["$B$/$n(B"]) ("kwi" ["$B$/$#(B"]) ("kwe" ["$B$/$'(B"]) ("kwo" ["$B$/$)(B"])
-    ("tsa" ["$B$D$!(B"]) ("tsi" ["$B$D$#(B"]) ("tse" ["$B$D$'(B"]) ("tso" ["$B$D$)(B"])
-    ( "fa" ["$B$U$!(B"]) ( "fi" ["$B$U$#(B"]) ( "fe" ["$B$U$'(B"]) ( "fo" ["$B$U$)(B"])
-    ("gwa" ["$B$0$n(B"]) ("gwi" ["$B$0$#(B"]) ("gwe" ["$B$0$'(B"]) ("gwo" ["$B$0$)(B"])
-
-    ("dyi" ["$B$G$#(B"]) ("dyu" ["$B$I$%(B"]) ("dye" ["$B$G$'(B"]) ("dyo" ["$B$I$)(B"])
-    ("xwi" ["$B$&$#(B"])                  ("xwe" ["$B$&$'(B"]) ("xwo" ["$B$&$)(B"])
-
-    ("shi" "$B$7(B") ("tyi" ["$B$F$#(B"]) ("chi" "$B$A(B") ("tsu" "$B$D(B") ("ji" "$B$8(B")
-    ("fu"  "$B$U(B")
-    ("ye" ["$B$$$'(B"])
-
-    ("va" ["$B%t$!(B"]) ("vi" ["$B%t$#(B"]) ("vu" "$B%t(B") ("ve" ["$B%t$'(B"]) ("vo" ["$B%t$)(B"])
-
-    ("xa"  "$B$!(B") ("xi"  "$B$#(B") ("xu"  "$B$%(B") ("xe"  "$B$'(B") ("xo"  "$B$)(B")
-    ("xtu" "$B$C(B") ("xya" "$B$c(B") ("xyu" "$B$e(B") ("xyo" "$B$g(B") ("xwa" "$B$n(B")
-    ("xka" "$B%u(B") ("xke" "$B%v(B")
-
-    ("1" "$B#1(B") ("2" "$B#2(B") ("3" "$B#3(B") ("4" "$B#4(B") ("5" "$B#5(B")
-    ("6" "$B#6(B") ("7" "$B#7(B") ("8" "$B#8(B") ("9" "$B#9(B") ("0" "$B#0(B")
-
-    ("!" "$B!*(B") ("@" "$B!w(B") ("#" "$B!t(B") ("$" "$B!p(B") ("%" "$B!s(B")
-    ("^" "$B!0(B") ("&" "$B!u(B") ("*" "$B!v(B") ("(" "$B!J(B") (")" "$B!K(B")
-    ("-" "$B!<(B") ("=" "$B!a(B") ("`" "$B!.(B") ("\\" "$B!o(B") ("|" "$B!C(B")
-    ("_" "$B!2(B") ("+" "$B!\(B") ("~" "$B!1(B") ("[" "$B!V(B") ("]" "$B!W(B")
-    ("{" "$B!P(B") ("}" "$B!Q(B") (":" "$B!'(B") (";" "$B!((B") ("\""  "$B!I(B")
-    ("'" "$B!G(B") ("." "$B!#(B") ("," "$B!"(B") ("<" "$B!c(B") (">" "$B!d(B")
-    ("?" "$B!)(B") ("/" "$B!?(B")
-
-    ("z1" "$B!{(B") ("z!" "$B!|(B")
-    ("z2" "$B"&(B") ("z@" "$B"'(B")
-    ("z3" "$B"$(B") ("z#" "$B"%(B")
-    ("z4" "$B""(B") ("z$" "$B"#(B")
-    ("z5" "$B!~(B") ("z%" "$B"!(B")
-    ("z6" "$B!y(B") ("z^" "$B!z(B")
-    ("z7" "$B!}(B") ("z&" "$B!r(B")
-    ("z8" "$B!q(B") ("z*" "$B!_(B")
-    ("z9" "$B!i(B") ("z(" "$B!Z(B")
-    ("z0" "$B!j(B") ("z)" "$B![(B")
-    ("z-" "$B!A(B") ("z_" "$B!h(B")
-    ("z=" "$B!b(B") ("z+" "$B!^(B")
-    ("z\\" "$B!@(B") ("z|" "$B!B(B")
-    ("z`" "$B!-(B") ("z~" "$B!/(B")
-
-    ("zq" "$B!T(B") ("zQ" "$B!R(B")
-    ("zw" "$B!U(B") ("zW" "$B!S(B")
-    ("zr" "$B!9(B") ("zR" "$B!8(B")
-    ("zt" "$B!:(B") ("zT" "$B!x(B")
-    ("zp" "$B")(B") ("zP" "$B",(B")
-    ("z[" "$B!X(B") ("z{" "$B!L(B")
-    ("z]" "$B!Y(B") ("z}" "$B!M(B")
-
-    ("zs" "$B!3(B") ("zS" "$B!4(B")
-    ("zd" "$B!5(B") ("zD" "$B!6(B")
-    ("zf" "$B!7(B") ("zF" "$B"*(B")
-    ("zg" "$B!>(B") ("zG" "$B!=(B")
-    ("zh" "$B"+(B")
-    ("zj" "$B"-(B")
-    ("zk" "$B",(B")
-    ("zl" "$B"*(B")
-    ("z;" "$B!+(B") ("z:" "$B!,(B")
-    ("z'" "$B!F(B") ("z\"" "$B!H(B")
+  '(( "a" "あ") ( "i" "い") ( "u" "う") ( "e" "え") ( "o" "お")
+    ("ka" "か") ("ki" "き") ("ku" "く") ("ke" "け") ("ko" "こ")
+    ("sa" "さ") ("si" "し") ("su" "す") ("se" "せ") ("so" "そ")
+    ("ta" "た") ("ti" "ち") ("tu" "つ") ("te" "て") ("to" "と")
+    ("na" "な") ("ni" "に") ("nu" "ぬ") ("ne" "ね") ("no" "の")
+    ("ha" "は") ("hi" "ひ") ("hu" "ふ") ("he" "へ") ("ho" "ほ")
+    ("ma" "ま") ("mi" "み") ("mu" "む") ("me" "め") ("mo" "も")
+    ("ya" "や")             ("yu" "ゆ")             ("yo" "よ")
+    ("ra" "ら") ("ri" "り") ("ru" "る") ("re" "れ") ("ro" "ろ")
+    ("la" "ら") ("li" "り") ("lu" "る") ("le" "れ") ("lo" "ろ")
+    ("wa" "わ") ("wi" "ゐ") ("wu" "う") ("we" "ゑ") ("wo" "を")
+    ("n'" "ん")
+    ("ga" "が") ("gi" "ぎ") ("gu" "ぐ") ("ge" "げ") ("go" "ご")
+    ("za" "ざ") ("zi" "じ") ("zu" "ず") ("ze" "ぜ") ("zo" "ぞ")
+    ("da" "だ") ("di" "ぢ") ("du" "づ") ("de" "で") ("do" "ど")
+    ("ba" "ば") ("bi" "び") ("bu" "ぶ") ("be" "べ") ("bo" "ぼ")
+    ("pa" "ぱ") ("pi" "ぴ") ("pu" "ぷ") ("pe" "ぺ") ("po" "ぽ")
+
+    ("kya" ["きゃ"]) ("kyu" ["きゅ"]) ("kye" ["きぇ"]) ("kyo" ["きょ"])
+    ("sya" ["しゃ"]) ("syu" ["しゅ"]) ("sye" ["しぇ"]) ("syo" ["しょ"])
+    ("sha" ["しゃ"]) ("shu" ["しゅ"]) ("she" ["しぇ"]) ("sho" ["しょ"])
+    ("cha" ["ちゃ"]) ("chu" ["ちゅ"]) ("che" ["ちぇ"]) ("cho" ["ちょ"])
+    ("tya" ["ちゃ"]) ("tyu" ["ちゅ"]) ("tye" ["ちぇ"]) ("tyo" ["ちょ"])
+    ("nya" ["にゃ"]) ("nyu" ["にゅ"]) ("nye" ["にぇ"]) ("nyo" ["にょ"])
+    ("hya" ["ひゃ"]) ("hyu" ["ひゅ"]) ("hye" ["ひぇ"]) ("hyo" ["ひょ"])
+    ("mya" ["みゃ"]) ("myu" ["みゅ"]) ("mye" ["みぇ"]) ("myo" ["みょ"])
+    ("rya" ["りゃ"]) ("ryu" ["りゅ"]) ("rye" ["りぇ"]) ("ryo" ["りょ"])
+    ("lya" ["りゃ"]) ("lyu" ["りゅ"]) ("lye" ["りぇ"]) ("lyo" ["りょ"])
+    ("gya" ["ぎゃ"]) ("gyu" ["ぎゅ"]) ("gye" ["ぎぇ"]) ("gyo" ["ぎょ"])
+    ("zya" ["じゃ"]) ("zyu" ["じゅ"]) ("zye" ["じぇ"]) ("zyo" ["じょ"])
+    ("jya" ["じゃ"]) ("jyu" ["じゅ"]) ("jye" ["じぇ"]) ("jyo" ["じょ"])
+    ( "ja" ["じゃ"]) ( "ju" ["じゅ"]) ( "je" ["じぇ"]) ( "jo" ["じょ"])
+    ("bya" ["びゃ"]) ("byu" ["びゅ"]) ("bye" ["びぇ"]) ("byo" ["びょ"])
+    ("pya" ["ぴゃ"]) ("pyu" ["ぴゅ"]) ("pye" ["ぴぇ"]) ("pyo" ["ぴょ"])
+
+    ("kwa" ["くゎ"]) ("kwi" ["くぃ"]) ("kwe" ["くぇ"]) ("kwo" ["くぉ"])
+    ("tsa" ["つぁ"]) ("tsi" ["つぃ"]) ("tse" ["つぇ"]) ("tso" ["つぉ"])
+    ( "fa" ["ふぁ"]) ( "fi" ["ふぃ"]) ( "fe" ["ふぇ"]) ( "fo" ["ふぉ"])
+    ("gwa" ["ぐゎ"]) ("gwi" ["ぐぃ"]) ("gwe" ["ぐぇ"]) ("gwo" ["ぐぉ"])
+
+    ("dyi" ["でぃ"]) ("dyu" ["どぅ"]) ("dye" ["でぇ"]) ("dyo" ["どぉ"])
+    ("xwi" ["うぃ"])                  ("xwe" ["うぇ"]) ("xwo" ["うぉ"])
+
+    ("shi" "し") ("tyi" ["てぃ"]) ("chi" "ち") ("tsu" "つ") ("ji" "じ")
+    ("fu"  "ふ")
+    ("ye" ["いぇ"])
+
+    ("va" ["ヴぁ"]) ("vi" ["ヴぃ"]) ("vu" "ヴ") ("ve" ["ヴぇ"]) ("vo" ["ヴぉ"])
+
+    ("xa"  "ぁ") ("xi"  "ぃ") ("xu"  "ぅ") ("xe"  "ぇ") ("xo"  "ぉ")
+    ("xtu" "っ") ("xya" "ゃ") ("xyu" "ゅ") ("xyo" "ょ") ("xwa" "ゎ")
+    ("xka" "ヵ") ("xke" "ヶ")
+
+    ("1" "１") ("2" "２") ("3" "３") ("4" "４") ("5" "５")
+    ("6" "６") ("7" "７") ("8" "８") ("9" "９") ("0" "０")
+
+    ("!" "！") ("@" "＠") ("#" "＃") ("$" "＄") ("%" "％")
+    ("^" "＾") ("&" "＆") ("*" "＊") ("(" "（") (")" "）")
+    ("-" "ー") ("=" "＝") ("`" "｀") ("\\" "￥") ("|" "｜")
+    ("_" "＿") ("+" "＋") ("~" "￣") ("[" "「") ("]" "」")
+    ("{" "｛") ("}" "｝") (":" "：") (";" "；") ("\""  "”")
+    ("'" "’") ("." "。") ("," "、") ("<" "＜") (">" "＞")
+    ("?" "？") ("/" "／")
+
+    ("z1" "○") ("z!" "●")
+    ("z2" "▽") ("z@" "▼")
+    ("z3" "△") ("z#" "▲")
+    ("z4" "□") ("z$" "■")
+    ("z5" "◇") ("z%" "◆")
+    ("z6" "☆") ("z^" "★")
+    ("z7" "◎") ("z&" "£")
+    ("z8" "¢") ("z*" "×")
+    ("z9" "♂") ("z(" "【")
+    ("z0" "♀") ("z)" "】")
+    ("z-" "〜") ("z_" "∴")
+    ("z=" "≠") ("z+" "±")
+    ("z\\" "＼") ("z|" "‖")
+    ("z`" "´") ("z~" "¨")
+
+    ("zq" "《") ("zQ" "〈")
+    ("zw" "》") ("zW" "〉")
+    ("zr" "々") ("zR" "仝")
+    ("zt" "〆") ("zT" "§")
+    ("zp" "〒") ("zP" "↑")
+    ("z[" "『") ("z{" "〔")
+    ("z]" "』") ("z}" "〕")
+
+    ("zs" "ヽ") ("zS" "ヾ")
+    ("zd" "ゝ") ("zD" "ゞ")
+    ("zf" "〃") ("zF" "→")
+    ("zg" "‐") ("zG" "—")
+    ("zh" "←")
+    ("zj" "↓")
+    ("zk" "↑")
+    ("zl" "→")
+    ("z;" "゛") ("z:" "゜")
+    ("z'" "‘") ("z\"" "“")
 
     ("zx" [":-"]) ("zX" [":-)"])
-    ("zc" "$B!;(B") ("zC" "$B!n(B")
-    ("zv" "$B"((B") ("zV" "$B!`(B")
-    ("zb" "$B!k(B") ("zB" "$B"+(B")
-    ("zn" "$B!l(B") ("zN" "$B"-(B")
-    ("zm" "$B!m(B") ("zM" "$B".(B")
-    ("z," "$B!E(B") ("z<" "$B!e(B")
-    ("z." "$B!D(B") ("z>" "$B!f(B")
-    ("z/" "$B!&(B") ("z?" "$B!g(B")
+    ("zc" "〇") ("zC" "℃")
+    ("zv" "※") ("zV" "÷")
+    ("zb" "°") ("zB" "←")
+    ("zn" "′") ("zN" "↓")
+    ("zm" "″") ("zM" "〓")
+    ("z," "‥") ("z<" "≦")
+    ("z." "…") ("z>" "≧")
+    ("z/" "・") ("z?" "∞")
 
     ("\\\\" quail-japanese-self-insert-and-switch-to-alpha)
     ("{{" quail-japanese-self-insert-and-switch-to-alpha)
@@ -252,81 +252,81 @@
     ))
 
 
-;; $B%m!<%^;zF~NO5Z$S2>L>4A;zJQ49$K$h$kF|K\8lF~NO%a%=%C%I(B
+;; ローマ字入力及び仮名漢字変換による日本語入力メソッド
 ;;
-;; $B$3$NF~NO%a%=%C%I$G$NF|K\8l$NF~NO$OFs$D$N%9%F!<%8!V%m!<%^;z2>L>JQ49!W(B
-;; $B$H!V2>L>4A;zJQ49!W$+$i$J$k!#:G=i$O%m!<%^;z2>L>JQ49$N%9%F!<%8$G!"%9(B
-;; $B%Z!<%9%-!<$r2!$9$3$H$K$h$j!"<!$N%9%F!<%8!V2>L>4A;zJQ49!W$X?J$`!#(B
+;; この入力メソッドでの日本語の入力は二つのステージ「ローマ字仮名変換」
+;; と「仮名漢字変換」からなる。最初はローマ字仮名変換のステージで、ス
+;; ペースキーを押すことにより、次のステージ「仮名漢字変換」へ進む。
 ;;
-;; $B!V%m!<%^;z2>L>JQ49!W(B
+;; 「ローマ字仮名変換」
 ;;
-;; $BJ?2>L>$O>.J8;z%-!<!JNs!K$rBG$D$3$H$K$h$jF~NO!#6gFIE@!"3g8LN`$OBP1~(B
-;; $B$9$k1Q;z%-!<$rBG$D$3$H$K$h$jF~NO!#$=$NB>$N%7%s%\%k$O(B `z' $B$KB3$1$F2?(B
-;; $B$l$+$N%-!<$rBG$D$3$H$K$h$jF~NO!#2<$KA4$F$N2DG=$J%-!<%7!<%1%s%9%j%9(B
-;; $B%H%"%C%W$5$l$F$$$k!#F~NO$5$l$?J8;z$O2<@~$G<($5$l$k!#(B
+;; 平仮名は小文字キー（列）を打つことにより入力。句読点、括弧類は対応
+;; する英字キーを打つことにより入力。その他のシンボルは `z' に続けて何
+;; れかのキーを打つことにより入力。下に全ての可能なキーシーケンスリス
+;; トアップされている。入力された文字は下線で示される。
 ;;
-;; $B$5$i$K0J2<$N%-!<$GFCJL$J=hM}$r9T$&!#(B
+;; さらに以下のキーで特別な処理を行う。
 ;;
-;; K	$BJ?2>L>$rJR2>L>$K!"$"$k$$$OJR2>L>$rJ?2>L>$KJQ49(B
-;; qq	$B$3$NF~NO%a%=%C%I$H(B `japanese-ascii' $BF~NO%a%=%C%I$r%H%0%k@ZBX(B
-;; qz	`japanese-zenkaku' $BF~NO%a%=%C%I$K%7%U%H(B
-;;	qh $B$HBG$F$P85$KLa$k(B
-;; RET	$B8=:_$NF~NOJ8;zNs$r3NDj(B
-;; SPC	$B2>L>4A;zJQ49$K?J$`(B
+;; K	平仮名を片仮名に、あるいは片仮名を平仮名に変換
+;; qq	この入力メソッドと `japanese-ascii' 入力メソッドをトグル切替
+;; qz	`japanese-zenkaku' 入力メソッドにシフト
+;;	qh と打てば元に戻る
+;; RET	現在の入力文字列を確定
+;; SPC	仮名漢字変換に進む
 ;;
-;; `japanese-ascii' $BF~NO%a%=%C%I$O(B ASCII $BJ8;z$rF~NO$9$k$N$K;H$&!#$3$l(B
-;; $B$OF~NO%a%=%C%I$r%*%U$K$9$k$N$H$[$H$s$IF1$8$G$"$k!#0[$J$k$N$O(B qq $B$H(B
-;; $BBG$D$3$H$K$h$j!"(B`japanese' $BF~NO%a%=%C%I$KLa$l$kE@$G$"$k!#(B
+;; `japanese-ascii' 入力メソッドは ASCII 文字を入力するのに使う。これ
+;; は入力メソッドをオフにするのとほとんど同じである。異なるのは qq と
+;; 打つことにより、`japanese' 入力メソッドに戻れる点である。
 ;;
-;; `japanese-zenkaku' $BF~NO%a%=%C%I$OA43Q1Q?t;z$rF~NO$9$k$N$K;H$&!#(B
+;; `japanese-zenkaku' 入力メソッドは全角英数字を入力するのに使う。
 ;;
-;; $B!V%m!<%^;z2>L>JQ49!W%9%F!<%8$G$N%-!<%7!<%1%s%9$N%j%9%H$O:G8e$KIU$1(B
-;; $B$F$"$k!#(B
+;; 「ローマ字仮名変換」ステージでのキーシーケンスのリストは最後に付け
+;; てある。
 ;;
-;; $B!V2>L>4A;zJQ49!W(B
+;; 「仮名漢字変換」
 ;;
-;; $B$3$N%9%F!<%8$G$O!"A0%9%F!<%8$GF~NO$5$l$?J8;zNs$r2>L>4A;zJQ49$9$k!#(B
-;; $BJQ49$5$l$?J8;zNs$O!"CmL\J8@a!JH?E>I=<(!K$H;D$j$NF~NO!J2<@~I=<(!K$K(B
-;; $BJ,$1$i$l$k!#CmL\J8@a$KBP$7$F$O0J2<$N%3%^%s%I$,;H$($k!#(B
+;; このステージでは、前ステージで入力された文字列を仮名漢字変換する。
+;; 変換された文字列は、注目文節（反転表示）と残りの入力（下線表示）に
+;; 分けられる。注目文節に対しては以下のコマンドが使える。
 ;;
 ;; SPC, C-n	kkc-next
-;;	$B<!$NJQ498uJd$rI=<((B
-;;	kkc-show-conversion-list-count $B0J>eB3$1$FBG$F$P!"JQ498uJd%j%9(B
-;;	$B%H$r%(%3!<%(%j%"$KI=<((B
+;;	次の変換候補を表示
+;;	kkc-show-conversion-list-count 以上続けて打てば、変換候補リス
+;;	トをエコーエリアに表示
 ;; C-p		kkc-prev
-;;	$BA0$NJQ498uJd$rI=<((B
-;;	kkc-show-conversion-list-count $B0J>eB3$1$FBG$F$P!"JQ498uJd%j%9(B
-;;	$B%H$r%(%3!<%(%j%"$KI=<((B
+;;	前の変換候補を表示
+;;	kkc-show-conversion-list-count 以上続けて打てば、変換候補リス
+;;	トをエコーエリアに表示
 ;; l		kkc-show-conversion-list-or-next-group
-;;	$B:G9b#1#08D$^$G$NJQ498uJd$r%(%3!<%(%j%"$KI=<(!#(B
-;;	$BB3$1$FBG$?$l$l$P!"<!$N#1#08uJd$rI=<(!#(B
+;;	最高１０個までの変換候補をエコーエリアに表示。
+;;	続けて打たれれば、次の１０候補を表示。
 ;; L		kkc-show-conversion-list-or-prev-group
-;;	$B:G9b#1#08D$^$G$NJQ498uJd$r%(%3!<%(%j%"$KI=<(!#(B
-;;	$BB3$1$FBG$?$l$l$P!"A0$N#1#08uJd$rI=<(!#(B
+;;	最高１０個までの変換候補をエコーエリアに表示。
+;;	続けて打たれれば、前の１０候補を表示。
 ;; 0..9		kkc-select-from-list
-;;	$BBG$?$l$??t;z$NJQ498uJd$rA*Br(B
+;;	打たれた数字の変換候補を選択
 ;; H		kkc-hiragana
-;;	$BCmL\J8@a$rJ?2>L>$KJQ49(B
+;;	注目文節を平仮名に変換
 ;; K		kkc-katakana
-;;	$BCmL\J8@a$rJR2>L>$KJQ49(B
+;;	注目文節を片仮名に変換
 ;; C-o		kkc-longer
-;;	$BCmL\J8@a$r8e$m$K0lJ8;z?-$P$9(B
+;;	注目文節を後ろに一文字伸ばす
 ;; C-i		kkc-shorter
-;;	$BCmL\J8@a$r8e$m$+$i0lJ8;z=L$a$k(B
+;;	注目文節を後ろから一文字縮める
 ;; C-f		kkc-next-phrase
-;;	$BCmL\J8@a$r3NDj$5$;$k!#$b$7;D$j$NF~NO$,$^$@$"$l$P!":G=i$NJ8@a$r(B
-;;	$BA*Br$7!"$=$l$rCmL\J8@a$H$7!"$=$N:G=i$NJQ498uJd$rI=<($9$k!#(B
+;;	注目文節を確定させる。もし残りの入力がまだあれば、最初の文節を
+;;	選択し、それを注目文節とし、その最初の変換候補を表示する。
 ;; DEL, C-c	kkc-cancel
-;;	$B2>L>4A;zJQ49$r%-%c%s%;%k$7!"%m!<%^;z2>L>JQ49$N%9%F!<%8$KLa$k!#(B
+;;	仮名漢字変換をキャンセルし、ローマ字仮名変換のステージに戻る。
 ;; return		kkc-terminate
-;;	$BA4J8@a$r3NDj$5$;$k!#(B
+;;	全文節を確定させる。
 ;; C-SPC, C-@	kkc-first-char-only
-;;	$B:G=i$NJ8;z$r3NDj$5$;!";D$j$O:o=|$9$k!#(B
+;;	最初の文字を確定させ、残りは削除する。
 ;; C-h		kkc-help
-;;	$B$3$l$i$N%-!<%P%$%s%I$N%j%9%H$rI=<($9$k!#$"(B
+;;	これらのキーバインドのリストを表示する。あ
 
 (quail-define-package
- "japanese" "Japanese" "A$B$"(B"
+ "japanese" "Japanese" "Aあ"
  nil
  "Japanese input method by Roman transliteration and Kana-Kanji conversion.
 
@@ -433,7 +433,7 @@ Type \"qq\" to go back to previous input method."
 (quail-define-rules ("qq" quail-japanese-switch-package))
 
 (quail-define-package
- "japanese-zenkaku" "Japanese" "$B#A(B"
+ "japanese-zenkaku" "Japanese" "Ａ"
  nil
  "Japanese zenkaku alpha numeric character input method.
 ---- Special key bindings ----
@@ -445,30 +445,30 @@ qh:	shift to the input method `japanese',
 
 (quail-define-rules
 
-(" " "$B!!(B") ("!" "$B!*(B") ("\"" "$B!m(B") ("#" "$B!t(B")
-("$" "$B!p(B") ("%" "$B!s(B") ("&" "$B!u(B") ("'" "$B!l(B")
-("(" "$B!J(B") (")" "$B!K(B") ("*" "$B!v(B") ("+" "$B!\(B")
-("," "$B!$(B") ("-" "$B!](B") ("." "$B!%(B") ("/" "$B!?(B")
-("0" "$B#0(B") ("1" "$B#1(B") ("2" "$B#2(B") ("3" "$B#3(B")
-("4" "$B#4(B") ("5" "$B#5(B") ("6" "$B#6(B") ("7" "$B#7(B")
-("8" "$B#8(B") ("9" "$B#9(B") (":" "$B!'(B") (";" "$B!((B")
-("<" "$B!c(B") ("=" "$B!a(B") (">" "$B!d(B") ("?" "$B!)(B")
-("@" "$B!w(B") ("A" "$B#A(B") ("B" "$B#B(B") ("C" "$B#C(B")
-("D" "$B#D(B") ("E" "$B#E(B") ("F" "$B#F(B") ("G" "$B#G(B")
-("H" "$B#H(B") ("I" "$B#I(B") ("J" "$B#J(B") ("K" "$B#K(B")
-("L" "$B#L(B") ("M" "$B#M(B") ("N" "$B#N(B") ("O" "$B#O(B")
-("P" "$B#P(B") ("Q" "$B#Q(B") ("R" "$B#R(B") ("S" "$B#S(B")
-("T" "$B#T(B") ("U" "$B#U(B") ("V" "$B#V(B") ("W" "$B#W(B")
-("X" "$B#X(B") ("Y" "$B#Y(B") ("Z" "$B#Z(B") ("[" "$B!N(B")
-("\\" "$B!o(B") ("]" "$B!O(B") ("^" "$B!0(B") ("_" "$B!2(B")
-("`" "$B!F(B") ("a" "$B#a(B") ("b" "$B#b(B") ("c" "$B#c(B")
-("d" "$B#d(B") ("e" "$B#e(B") ("f" "$B#f(B") ("g" "$B#g(B")
-("h" "$B#h(B") ("i" "$B#i(B") ("j" "$B#j(B") ("k" "$B#k(B")
-("l" "$B#l(B") ("m" "$B#m(B") ("n" "$B#n(B") ("o" "$B#o(B")
-("p" "$B#p(B") ("q" "$B#q(B") ("r" "$B#r(B") ("s" "$B#s(B")
-("t" "$B#t(B") ("u" "$B#u(B") ("v" "$B#v(B") ("w" "$B#w(B")
-("x" "$B#x(B") ("y" "$B#y(B") ("z" "$B#z(B") ("{" "$B!P(B")
-("|" "$B!C(B") ("}" "$B!Q(B") ("~" "$B!A(B")
+(" " "　") ("!" "！") ("\"" "″") ("#" "＃")
+("$" "＄") ("%" "％") ("&" "＆") ("'" "′")
+("(" "（") (")" "）") ("*" "＊") ("+" "＋")
+("," "，") ("-" "−") ("." "．") ("/" "／")
+("0" "０") ("1" "１") ("2" "２") ("3" "３")
+("4" "４") ("5" "５") ("6" "６") ("7" "７")
+("8" "８") ("9" "９") (":" "：") (";" "；")
+("<" "＜") ("=" "＝") (">" "＞") ("?" "？")
+("@" "＠") ("A" "Ａ") ("B" "Ｂ") ("C" "Ｃ")
+("D" "Ｄ") ("E" "Ｅ") ("F" "Ｆ") ("G" "Ｇ")
+("H" "Ｈ") ("I" "Ｉ") ("J" "Ｊ") ("K" "Ｋ")
+("L" "Ｌ") ("M" "Ｍ") ("N" "Ｎ") ("O" "Ｏ")
+("P" "Ｐ") ("Q" "Ｑ") ("R" "Ｒ") ("S" "Ｓ")
+("T" "Ｔ") ("U" "Ｕ") ("V" "Ｖ") ("W" "Ｗ")
+("X" "Ｘ") ("Y" "Ｙ") ("Z" "Ｚ") ("[" "［")
+("\\" "￥") ("]" "］") ("^" "＾") ("_" "＿")
+("`" "‘") ("a" "ａ") ("b" "ｂ") ("c" "ｃ")
+("d" "ｄ") ("e" "ｅ") ("f" "ｆ") ("g" "ｇ")
+("h" "ｈ") ("i" "ｉ") ("j" "ｊ") ("k" "ｋ")
+("l" "ｌ") ("m" "ｍ") ("n" "ｎ") ("o" "ｏ")
+("p" "ｐ") ("q" "ｑ") ("r" "ｒ") ("s" "ｓ")
+("t" "ｔ") ("u" "ｕ") ("v" "ｖ") ("w" "ｗ")
+("x" "ｘ") ("y" "ｙ") ("z" "ｚ") ("{" "｛")
+("|" "｜") ("}" "｝") ("~" "〜")
 
 ("qq" quail-japanese-switch-package)
 ("qh" quail-japanese-switch-package)
@@ -485,7 +485,7 @@ qh:	shift to the input method `japanese',
 
 (quail-define-package
  "japanese-hankaku-kana"
- "Japanese" "(I1(B"
+ "Japanese" "ｱ"
  nil
  "Japanese hankaku katakana input method by Roman transliteration.
 ---- Special key bindings ----
@@ -514,7 +514,7 @@ qq:	toggle between this input method and the input method `japanese-ascii'.
 		   trans)))
 
 (quail-define-package
- "japanese-hiragana" "Japanese" "$B$"(B"
+ "japanese-hiragana" "Japanese" "あ"
  nil
  "Japanese hiragana input method by Roman transliteration."
  nil t t nil nil nil nil nil
@@ -535,7 +535,7 @@ qq:	toggle between this input method and the input method `japanese-ascii'.
   control-flag)
 
 (quail-define-package
- "japanese-katakana" "Japanese" "$B%"(B"
+ "japanese-katakana" "Japanese" "ア"
  nil
  "Japanese katakana input method by Roman transliteration."
  nil t t nil nil nil nil nil
diff --git a/lisp/leim/quail/py-punct.el b/lisp/leim/quail/py-punct.el
index 35bd79e99b..eed70a82ee 100644
--- a/lisp/leim/quail/py-punct.el
+++ b/lisp/leim/quail/py-punct.el
@@ -1,4 +1,4 @@
-;;; py-punct.el --- Quail packages for Chinese (pinyin + extra symbols)  -*-coding: iso-2022-7bit;-*-
+;;; py-punct.el --- Quail packages for Chinese (pinyin + extra symbols)
 
 ;; Copyright (C) 2001-2019 Free Software Foundation, Inc.
 ;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
@@ -35,16 +35,16 @@
 (load "quail/Punct")
 
 (quail-define-package
- "chinese-py-punct" "Chinese-GB" "$AF47{(B"
+ "chinese-py-punct" "Chinese-GB" "拼符"
  t
- "$A::WVJdHk(B $AF4Rt7=08(B and `v' for $A1j5c7{:EJdHk(B
+ "汉字输入 拼音方案 and `v' for 标点符号输入
 
 This is the combination of the input methods `chinese-py' and `chinese-punct'.
 You can enter normal Chinese characters by the same way as `chinese-py'.
 And, you can enter symbols by typing `v' followed by any key sequences
 defined in `chinese-punct'.
 
-For instance, typing `v' and `%' insert `$A#%(B'.
+For instance, typing `v' and `%' insert `％'.
 ")
 
 (setcar (nthcdr 2 quail-current-package)
@@ -55,9 +55,9 @@ For instance, typing `v' and `%' insert `$A#%(B'.
 (load "quail/TONEPY")
 
 (quail-define-package
- "chinese-tonepy-punct" "Chinese-GB" "$AF47{(B"
+ "chinese-tonepy-punct" "Chinese-GB" "拼符"
  t
- "$A::WVJdHk(B $A4x5wF4Rt7=08(B and `v' for $A1j5c7{:EJdHk(B
+ "汉字输入 带调拼音方案 and `v' for 标点符号输入
 
 This is the combination of the input methods `chinese-tonepy' and
 `chinese-punct'.
@@ -66,7 +66,7 @@ You can enter normal Chinese characters by the same way as
 `chinese-tonepy'.  And, you can enter symbols by typing `v' followed
 by any key sequences defined in `chinese-punct'.
 
-For instance, typing `v' and `%' insert `$A#%(B'.
+For instance, typing `v' and `%' insert `％'.
 ")
 
 (setcar (nthcdr 2 quail-current-package)
diff --git a/lisp/leim/quail/pypunct-b5.el b/lisp/leim/quail/pypunct-b5.el
index ef5863101d..45597a4ef6 100644
--- a/lisp/leim/quail/pypunct-b5.el
+++ b/lisp/leim/quail/pypunct-b5.el
@@ -1,4 +1,4 @@
-;;; pypunct-b5.el --- Quail packages for Chinese (pinyin + extra symbols) -*-coding: iso-2022-7bit;-*-
+;;; pypunct-b5.el --- Quail packages for Chinese (pinyin + extra symbols)
 
 ;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
 ;;   2006, 2007, 2008, 2009, 2010, 2011
@@ -34,9 +34,9 @@
 (load "quail/Punct-b5")
 
 (quail-define-package
- "chinese-py-punct-b5" "Chinese-BIG5" "$(03<>K(B"
+ "chinese-py-punct-b5" "Chinese-BIG5" "拼符"
  t
- "$(0&d'GTT&,!J3<5x!K(B and `v' for $(0O:X5>KHATT&,(B
+ "中文輸入【拼音】 and `v' for 標點符號輸入
 
 This is the combination of the input method `chinese-py-b5' and
 `chinese-punct-b5'.
@@ -45,7 +45,7 @@ You can enter normal Chinese characters by the same way as `chinese-py-b5'.
 And, you can enter symbols by typing `v' followed by any key sequences
 defined in `chinese-punct-b5'.
 
-For instance, typing `v' and `%' insert `$(0"h(B'.
+For instance, typing `v' and `%' insert `％'.
 ")
 
 (setcar (nthcdr 2 quail-current-package)

commit ce08594b2ae9dd7cf79c49ac4e1a06bee1c9ee22
Author: Stefan Monnier <monnier@iro.umontreal.ca>
Date:   Mon Jan 7 20:49:26 2019 -0500

    * lisp/international/titdic-cnv.el: Save generated files with utf-8
    
    (titdic-convert, miscdic-convert): Use utf-8 when writing and don't
    bother putting a `coding:` tag since utf-8 is the default anyway.

diff --git a/lisp/international/titdic-cnv.el b/lisp/international/titdic-cnv.el
index ac5a0e8861..ed020fe32a 100644
--- a/lisp/international/titdic-cnv.el
+++ b/lisp/international/titdic-cnv.el
@@ -500,8 +500,7 @@ the generated Quail package is saved."
 	    (goto-char (point-min))
 	    (decode-coding-region (point-min) (point-max) coding-system)
 	    ;; Explicitly set eol format to `unix'.
-	    (setq coding-system-for-write
-		  (coding-system-change-eol-conversion coding-system 'unix))
+	    (setq coding-system-for-write 'utf-8-unix)
 	    (remove-text-properties (point-min) (point-max) '(charset nil)))
 
 	  (set-buffer-multibyte t)
@@ -522,7 +521,6 @@ the generated Quail package is saved."
 	  (princ ";; Local Variables:\n")
 	  (princ ";; version-control: never\n")
 	  (princ ";; no-update-autoloads: t\n")
-	  (princ (format ";; coding: %s\n" coding-system-for-write))
 	  (princ ";; End:\n"))))))
 
 ;;;###autoload
@@ -1148,8 +1146,7 @@ the generated Quail package is saved."
 	      copyright (nth 6 slot))
 	(message "Converting %s to %s..." dicfile quailfile)
 	;; Explicitly set eol format to `unix'.
-	(setq coding-system-for-write
-	      (coding-system-change-eol-conversion coding 'unix))
+	(setq coding-system-for-write 'utf-8-unix)
 	(with-temp-file (expand-file-name quailfile dirname)
 	  (insert (format-message ";; Quail package `%s'\n" name))
 	  (insert (format-message
@@ -1178,7 +1175,6 @@ the generated Quail package is saved."
 	  (insert ";; Local Variables:\n"
 		  ";; version-control: never\n"
 		  ";; no-update-autoloads: t\n"
-		  (format ";; coding: %s\n" coding)
 		  ";; End:\n\n"
 		  ";;; " quailfile " ends here\n"))
 	(message "Converting %s to %s...done" dicfile quailfile))

commit 73fe3ad168e390056355660ae1b47a6994ae0803
Author: Glenn Morris <rgm@gnu.org>
Date:   Mon Jan 7 15:03:13 2019 -0500

    ; ChangeLog fix
    
    ref http://lists.gnu.org/r/emacs-devel/2019-01/msg00076.html

diff --git a/ChangeLog.3 b/ChangeLog.3
index 49176f8a5e..70d1b8f8d9 100644
--- a/ChangeLog.3
+++ b/ChangeLog.3
@@ -730,14 +730,6 @@
 2019-01-07  Nicolas Petton  <nicolas@petton.fr>
 
 	* etc/AUTHORS: Update.
-2019-01-03  Andrey Kotlarski  <m00naticus@gmail.com>
-
-	Fix EBROWSE parsing of classes declared final
-
-	* lib-src/ebrowse.c (enum token, token_string, init_scanner):
-	Handle final keyword.
-	(member, class_definition, globals): Correctly determine class
-	name in presence of final declaration.
 
 2018-11-18  Martin Rudalics  <rudalics@gmx.at>
 

commit ba2a0667e9efdef0e0d13b3d2b4392a1243baa9a
Merge: 1a07b12aaa 13b586d7a7
Author: Glenn Morris <rgm@gnu.org>
Date:   Mon Jan 7 11:51:38 2019 -0800

    ; Merge from origin/emacs-26
    
    The following commits were skipped:
    
    13b586d (origin/emacs-26) Adapt filenotify-tests for emba
    d8525ae (tag: emacs-26.1.91) Bump Emacs version to 26.1.91

commit 1a07b12aaaefce9959297c72b73ef111bf2e866e
Merge: ff406671b1 f1ce72b7c6
Author: Glenn Morris <rgm@gnu.org>
Date:   Mon Jan 7 11:51:38 2019 -0800

    Merge from origin/emacs-26
    
    f1ce72b ; ChangeLog.3 update
    5b59cf0 * etc/AUTHORS: Update.
    2cf20b6 * lisp/textmodes/mhtml-mode.el: Avoid loading flyspell.  (Bug...
    
    # Conflicts:
    #       ChangeLog.3
    #       lisp/textmodes/mhtml-mode.el

commit ff406671b10ad46d4b2b2abcabe0fdf64293c61c
Merge: 2c2bcc4ace 99e2ad9e4e
Author: Glenn Morris <rgm@gnu.org>
Date:   Mon Jan 7 11:51:23 2019 -0800

    ; Merge from origin/emacs-26
    
    The following commits were skipped:
    
    99e2ad9 Improve GC+Cairo workaround
    e0862ed Work around GC+Cairo bug

commit 2c2bcc4ace55215f4ff6ea5026f100c209d8ad2e
Merge: 6ab2bf329f 0ecff00bc1
Author: Glenn Morris <rgm@gnu.org>
Date:   Mon Jan 7 11:51:23 2019 -0800

    Merge from origin/emacs-26
    
    0ecff00 Improve commentary in font.h
    a058eda Fix definition of Qwindow_point_insertion_type (Bug#33871)

commit 6ab2bf329f4165e6db4b0424c37d0da8e2c0e53e
Merge: 517b0aa466 775517307d
Author: Glenn Morris <rgm@gnu.org>
Date:   Mon Jan 7 11:51:23 2019 -0800

    ; Merge from origin/emacs-26
    
    The following commit was skipped:
    
    7755173 Improve documentation of 'server-name'

commit 517b0aa46663b6173bb31a018aee18a82f2ca1d9
Merge: 67b90b5224 5f2aa328d1
Author: Glenn Morris <rgm@gnu.org>
Date:   Mon Jan 7 11:51:23 2019 -0800

    Merge from origin/emacs-26
    
    5f2aa32 Update Unicode copyright notice

commit 67b90b5224f011a0c90d866c6d511b04bb8d5866
Merge: b513feb812 08840f2f7b
Author: Glenn Morris <rgm@gnu.org>
Date:   Mon Jan 7 11:51:23 2019 -0800

    ; Merge from origin/emacs-26
    
    The following commits were skipped:
    
    08840f2 Handle quoted file names in filenotify.el
    e0870c3 ; Auto-commit of loaddefs files.

commit 13b586d7a7020ad3d28ccd980663586dfb8552b1
Author: Michael Albinus <michael.albinus@gmx.de>
Date:   Mon Jan 7 17:07:19 2019 +0100

    Adapt filenotify-tests for emba
    
    * .gitlab-ci.yml (test): Add EMACS_EMBA_CI variable.
    
    * test/lisp/filenotify-tests.el (file-notify-test03-events)
    (file-notify-test05-file-validity)
    (file-notify-test06-dir-validity)
    (file-notify-test07-many-events)
    (file-notify-test09-watched-file-in-watched-dir): Adapt tests for emba.

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index af573affc9..ff51c20726 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -35,6 +35,8 @@ stages:
 
 test:
   stage: test
+  variables:
+    EMACS_EMBA_CI: 1
   script:
     - ./autogen.sh autoconf
     - ./configure --without-makeinfo
diff --git a/test/lisp/filenotify-tests.el b/test/lisp/filenotify-tests.el
index 341c5afd6d..4e1a46285c 100644
--- a/test/lisp/filenotify-tests.el
+++ b/test/lisp/filenotify-tests.el
@@ -649,6 +649,10 @@ delivered."
 		'(created deleted stopped))
 	       ((string-equal (file-notify--test-library) "kqueue")
 		'(created changed deleted stopped))
+               ;; On emba, `deleted' and `stopped' events of the
+               ;; directory are not detected.
+               ((getenv "EMACS_EMBA_CI")
+                '(created changed deleted))
 	       (t '(created changed deleted deleted stopped)))
 	    (write-region
 	     "any text" nil file-notify--test-tmpfile nil 'no-message)
@@ -687,6 +691,10 @@ delivered."
 		'(created created changed changed deleted stopped))
 	       ((string-equal (file-notify--test-library) "kqueue")
 		'(created changed created changed deleted stopped))
+               ;; On emba, `deleted' and `stopped' events of the
+               ;; directory are not detected.
+               ((getenv "EMACS_EMBA_CI")
+                '(created changed created changed deleted deleted))
 	       (t '(created changed created changed
 		    deleted deleted deleted stopped)))
 	    (write-region
@@ -732,6 +740,10 @@ delivered."
 		'(created created deleted deleted stopped))
 	       ((string-equal (file-notify--test-library) "kqueue")
 		'(created changed renamed deleted stopped))
+               ;; On emba, `deleted' and `stopped' events of the
+               ;; directory are not detected.
+               ((getenv "EMACS_EMBA_CI")
+                '(created changed renamed deleted))
 	       (t '(created changed renamed deleted deleted stopped)))
 	    (write-region
 	     "any text" nil file-notify--test-tmpfile nil 'no-message)
@@ -940,51 +952,55 @@ delivered."
     (file-notify--test-cleanup))
 
   (unwind-protect
-      (let ((file-notify--test-tmpdir
-	     (make-temp-file "file-notify-test-parent" t)))
-	(should
-	 (setq file-notify--test-tmpfile (file-notify--test-make-temp-name)
-	       file-notify--test-desc
-	       (file-notify-add-watch
-		file-notify--test-tmpdir
-		'(change) #'file-notify--test-event-handler)))
-	(should (file-notify-valid-p file-notify--test-desc))
-	(file-notify--test-with-events
-	 (cond
-	  ;; w32notify does not raise `deleted' and `stopped' events
-	  ;; for the watched directory.
-	  ((string-equal (file-notify--test-library) "w32notify")
-	   '(created changed deleted))
-          ;; gvfs-monitor-dir on cygwin does not detect the `created'
-          ;; event reliably.
-	  ((string-equal (file-notify--test-library) "gvfs-monitor-dir.exe")
-	   '((deleted stopped)
-	     (created deleted stopped)))
-	  ;; There are two `deleted' events, for the file and for the
-	  ;; directory.  Except for cygwin and kqueue.  And cygwin
-	  ;; does not raise a `changed' event.
-	  ((eq system-type 'cygwin)
-	   '(created deleted stopped))
-	  ((string-equal (file-notify--test-library) "kqueue")
-	   '(created changed deleted stopped))
-	  (t '(created changed deleted deleted stopped)))
-	 (write-region
-	  "any text" nil file-notify--test-tmpfile nil 'no-message)
-	 (file-notify--test-read-event)
-	 (delete-directory file-notify--test-tmpdir 'recursive))
-	;; After deleting the parent directory, the descriptor must
-	;; not be valid anymore.
-	(should-not (file-notify-valid-p file-notify--test-desc))
-        ;; w32notify doesn't generate `stopped' events when the parent
-        ;; directory is deleted, which doesn't provide a chance for
-        ;; filenotify.el to remove the descriptor from the internal
-        ;; hash table it maintains.  So we must remove the descriptor
-        ;; manually.
-        (if (string-equal (file-notify--test-library) "w32notify")
-            (file-notify--rm-descriptor file-notify--test-desc))
+      ;; On emba, `deleted' and `stopped' events of the directory are
+      ;; not detected.
+      (unless (getenv "EMACS_EMBA_CI")
+        (let ((file-notify--test-tmpdir
+	       (make-temp-file "file-notify-test-parent" t)))
+	  (should
+	   (setq file-notify--test-tmpfile (file-notify--test-make-temp-name)
+	         file-notify--test-desc
+	         (file-notify-add-watch
+		  file-notify--test-tmpdir
+		  '(change) #'file-notify--test-event-handler)))
+	  (should (file-notify-valid-p file-notify--test-desc))
+	  (file-notify--test-with-events
+	      (cond
+	       ;; w32notify does not raise `deleted' and `stopped'
+	       ;; events for the watched directory.
+	       ((string-equal (file-notify--test-library) "w32notify")
+	        '(created changed deleted))
+               ;; gvfs-monitor-dir on cygwin does not detect the
+               ;; `created' event reliably.
+	       ((string-equal
+                 (file-notify--test-library) "gvfs-monitor-dir.exe")
+	        '((deleted stopped)
+	          (created deleted stopped)))
+	       ;; There are two `deleted' events, for the file and for
+	       ;; the directory.  Except for cygwin and kqueue.  And
+	       ;; cygwin does not raise a `changed' event.
+	       ((eq system-type 'cygwin)
+	        '(created deleted stopped))
+	       ((string-equal (file-notify--test-library) "kqueue")
+	        '(created changed deleted stopped))
+	       (t '(created changed deleted deleted stopped)))
+	    (write-region
+	     "any text" nil file-notify--test-tmpfile nil 'no-message)
+	    (file-notify--test-read-event)
+	    (delete-directory file-notify--test-tmpdir 'recursive))
+	  ;; After deleting the parent directory, the descriptor must
+	  ;; not be valid anymore.
+	  (should-not (file-notify-valid-p file-notify--test-desc))
+          ;; w32notify doesn't generate `stopped' events when the
+          ;; parent directory is deleted, which doesn't provide a
+          ;; chance for filenotify.el to remove the descriptor from
+          ;; the internal hash table it maintains.  So we must remove
+          ;; the descriptor manually.
+          (if (string-equal (file-notify--test-library) "w32notify")
+              (file-notify--rm-descriptor file-notify--test-desc))
 
-        ;; The environment shall be cleaned up.
-        (file-notify--test-cleanup-p))
+          ;; The environment shall be cleaned up.
+          (file-notify--test-cleanup-p)))
 
     ;; Cleanup.
     (file-notify--test-cleanup)))
@@ -1022,7 +1038,9 @@ delivered."
     (file-notify--test-cleanup))
 
   (unwind-protect
-      (progn
+      ;; On emba, `deleted' and `stopped' events of the directory are
+      ;; not detected.
+      (unless (getenv "EMACS_EMBA_CI")
 	(should
 	 (setq file-notify--test-tmpfile
 	       (make-temp-file "file-notify-test-parent" t)))
@@ -1109,7 +1127,8 @@ delivered."
             (file-notify--test-read-event)
             (delete-file file)))
         (delete-directory file-notify--test-tmpfile)
-        (if (string-equal (file-notify--test-library) "w32notify")
+        (if (or (string-equal (file-notify--test-library) "w32notify")
+                (getenv "EMACS_EMBA_CI"))
             (file-notify--rm-descriptor file-notify--test-desc))
 
         ;; The environment shall be cleaned up.
@@ -1316,11 +1335,17 @@ the file watch."
 		  ;; w32notify does not raise `deleted' and `stopped'
 		  ;; events for the watched directory.
                   ((string-equal (file-notify--test-library) "w32notify") '())
+                  ;; On emba, `deleted' and `stopped' events of the
+                  ;; directory are not detected.
+                  ((getenv "EMACS_EMBA_CI")
+                   '())
                   (t '(deleted stopped))))))
           (delete-directory file-notify--test-tmpfile 'recursive))
-        (should-not (file-notify-valid-p file-notify--test-desc1))
-        (should-not (file-notify-valid-p file-notify--test-desc2))
-        (when (string-equal (file-notify--test-library) "w32notify")
+        (unless (getenv "EMACS_EMBA_CI")
+          (should-not (file-notify-valid-p file-notify--test-desc1))
+          (should-not (file-notify-valid-p file-notify--test-desc2)))
+        (when (or (string-equal (file-notify--test-library) "w32notify")
+                  (getenv "EMACS_EMBA_CI"))
           (file-notify--rm-descriptor file-notify--test-desc1)
           (file-notify--rm-descriptor file-notify--test-desc2))
 

commit b513feb812496ce357e99e2e2ae611cb37d5a3fa
Author: Michael Albinus <michael.albinus@gmx.de>
Date:   Mon Jan 7 16:59:43 2019 +0100

    ; Format filenotify-tests.el

diff --git a/test/lisp/filenotify-tests.el b/test/lisp/filenotify-tests.el
index fdc8d00d86..50036209b0 100644
--- a/test/lisp/filenotify-tests.el
+++ b/test/lisp/filenotify-tests.el
@@ -450,36 +450,36 @@ This returns only for the local case and gfilenotify; otherwise it is nil.
       ;; harm.  This fails on Cygwin because of timing issues unless a
       ;; long `sit-for' is added before the call to
       ;; `file-notify--test-read-event'.
-    (if (not (eq system-type 'cygwin))
-      (let (results)
-        (cl-flet ((first-callback (event)
-                   (when (eq (nth 1 event) 'deleted) (push 1 results)))
-                  (second-callback (event)
-                   (when (eq (nth 1 event) 'deleted) (push 2 results))))
-          (setq file-notify--test-tmpfile (file-notify--test-make-temp-name))
-          (write-region
-           "any text" nil file-notify--test-tmpfile nil 'no-message)
-          (should
-           (setq file-notify--test-desc
-                 (file-notify-add-watch
-                  file-notify--test-tmpfile
-                  '(change) #'first-callback)))
-          (should
-           (setq file-notify--test-desc1
-                 (file-notify-add-watch
-                  file-notify--test-tmpfile
-                  '(change) #'second-callback)))
-          ;; Remove first watch.
-          (file-notify-rm-watch file-notify--test-desc)
-          ;; Only the second callback shall run.
-	  (file-notify--test-read-event)
-          (delete-file file-notify--test-tmpfile)
-          (file-notify--wait-for-events
-           (file-notify--test-timeout) results)
-          (should (equal results (list 2)))
+      (unless (eq system-type 'cygwin)
+        (let (results)
+          (cl-flet ((first-callback (event)
+                     (when (eq (nth 1 event) 'deleted) (push 1 results)))
+                    (second-callback (event)
+                     (when (eq (nth 1 event) 'deleted) (push 2 results))))
+            (setq file-notify--test-tmpfile (file-notify--test-make-temp-name))
+            (write-region
+             "any text" nil file-notify--test-tmpfile nil 'no-message)
+            (should
+             (setq file-notify--test-desc
+                   (file-notify-add-watch
+                    file-notify--test-tmpfile
+                    '(change) #'first-callback)))
+            (should
+             (setq file-notify--test-desc1
+                   (file-notify-add-watch
+                    file-notify--test-tmpfile
+                    '(change) #'second-callback)))
+            ;; Remove first watch.
+            (file-notify-rm-watch file-notify--test-desc)
+            ;; Only the second callback shall run.
+	    (file-notify--test-read-event)
+            (delete-file file-notify--test-tmpfile)
+            (file-notify--wait-for-events
+             (file-notify--test-timeout) results)
+            (should (equal results (list 2)))
 
-          ;; The environment shall be cleaned up.
-          (file-notify--test-cleanup-p))))
+            ;; The environment shall be cleaned up.
+            (file-notify--test-cleanup-p))))
 
     ;; Cleanup.
     (file-notify--test-cleanup)))
@@ -1014,9 +1014,10 @@ delivered."
     ;; Cleanup.
     (file-notify--test-cleanup))
 
-  ;; On emba, `deleted' and `stopped' events of the directory are not detected.
-  (unless (getenv "EMACS_EMBA_CI")
-    (unwind-protect
+  (unwind-protect
+      ;; On emba, `deleted' and `stopped' events of the directory are
+      ;; not detected.
+      (unless (getenv "EMACS_EMBA_CI")
         (let ((file-notify--test-tmpdir
 	       (make-temp-file "file-notify-test-parent" t)))
 	  (should
@@ -1062,10 +1063,10 @@ delivered."
               (file-notify--rm-descriptor file-notify--test-desc))
 
           ;; The environment shall be cleaned up.
-          (file-notify--test-cleanup-p))
+          (file-notify--test-cleanup-p)))
 
-      ;; Cleanup.
-      (file-notify--test-cleanup))))
+    ;; Cleanup.
+    (file-notify--test-cleanup)))
 
 (file-notify--deftest-remote file-notify-test05-file-validity
   "Check `file-notify-valid-p' via file notification for remote files.")
@@ -1099,33 +1100,33 @@ delivered."
     ;; Cleanup.
     (file-notify--test-cleanup))
 
-  ;; On emba, `deleted' and `stopped' events of the directory are not detected.
-  (unless (getenv "EMACS_EMBA_CI")
-    (unwind-protect
-        (progn
-	  (should
-	   (setq file-notify--test-tmpfile
-	         (make-temp-file "file-notify-test-parent" t)))
-	  (should
-	   (setq file-notify--test-desc
-	         (file-notify-add-watch
-		  file-notify--test-tmpfile '(change) #'ignore)))
-          (should (file-notify-valid-p file-notify--test-desc))
-          ;; After deleting the directory, the descriptor must not be
-          ;; valid anymore.
-          (delete-directory file-notify--test-tmpfile 'recursive)
-          (file-notify--wait-for-events
-	   (file-notify--test-timeout)
-	   (not (file-notify-valid-p file-notify--test-desc)))
-          (should-not (file-notify-valid-p file-notify--test-desc))
-          (if (string-equal (file-notify--test-library) "w32notify")
-              (file-notify--rm-descriptor file-notify--test-desc))
+  (unwind-protect
+      ;; On emba, `deleted' and `stopped' events of the directory are
+      ;; not detected.
+      (unless (getenv "EMACS_EMBA_CI")
+	(should
+	 (setq file-notify--test-tmpfile
+	       (make-temp-file "file-notify-test-parent" t)))
+	(should
+	 (setq file-notify--test-desc
+	       (file-notify-add-watch
+		file-notify--test-tmpfile '(change) #'ignore)))
+        (should (file-notify-valid-p file-notify--test-desc))
+        ;; After deleting the directory, the descriptor must not be
+        ;; valid anymore.
+        (delete-directory file-notify--test-tmpfile 'recursive)
+        (file-notify--wait-for-events
+	 (file-notify--test-timeout)
+	 (not (file-notify-valid-p file-notify--test-desc)))
+        (should-not (file-notify-valid-p file-notify--test-desc))
+        (if (string-equal (file-notify--test-library) "w32notify")
+            (file-notify--rm-descriptor file-notify--test-desc))
 
-          ;; The environment shall be cleaned up.
-          (file-notify--test-cleanup-p))
+        ;; The environment shall be cleaned up.
+        (file-notify--test-cleanup-p))
 
-      ;; Cleanup.
-      (file-notify--test-cleanup))))
+    ;; Cleanup.
+    (file-notify--test-cleanup)))
 
 (file-notify--deftest-remote file-notify-test06-dir-validity
   "Check `file-notify-valid-p' via file notification for remote directories.")

commit d8525ae41d07f9ea629d610de791064180423b6a (tag: refs/tags/emacs-26.1.91)
Author: Nicolas Petton <nicolas@petton.fr>
Date:   Mon Jan 7 15:37:10 2019 +0100

    Bump Emacs version to 26.1.91
    
    * README:
    * configure.ac:
    * msdos/sed2v2.inp:
    * nt/README.W32: Bump Emacs version to 26.1.91.

diff --git a/README b/README
index a95c82adbf..7e5ea256b5 100644
--- a/README
+++ b/README
@@ -2,7 +2,7 @@ Copyright (C) 2001-2019 Free Software Foundation, Inc.
 See the end of the file for license conditions.
 
 
-This directory tree holds version 26.1.90 of GNU Emacs, the extensible,
+This directory tree holds version 26.1.91 of GNU Emacs, the extensible,
 customizable, self-documenting real-time display editor.
 
 The file INSTALL in this directory says how to build and install GNU
diff --git a/configure.ac b/configure.ac
index 005f96b3a9..78cb6dbeaf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@ dnl  along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 AC_PREREQ(2.65)
 dnl Note this is parsed by (at least) make-dist and lisp/cedet/ede/emacs.el.
-AC_INIT(GNU Emacs, 26.1.90, bug-gnu-emacs@gnu.org)
+AC_INIT(GNU Emacs, 26.1.91, bug-gnu-emacs@gnu.org)
 
 dnl Set emacs_config_options to the options of 'configure', quoted for the shell,
 dnl and then quoted again for a C string.  Separate options with spaces.
diff --git a/msdos/sed2v2.inp b/msdos/sed2v2.inp
index 41fd88e7fc..846aa8ba15 100644
--- a/msdos/sed2v2.inp
+++ b/msdos/sed2v2.inp
@@ -66,7 +66,7 @@
 /^#undef PACKAGE_NAME/s/^.*$/#define PACKAGE_NAME ""/
 /^#undef PACKAGE_STRING/s/^.*$/#define PACKAGE_STRING ""/
 /^#undef PACKAGE_TARNAME/s/^.*$/#define PACKAGE_TARNAME ""/
-/^#undef PACKAGE_VERSION/s/^.*$/#define PACKAGE_VERSION "26.1.90"/
+/^#undef PACKAGE_VERSION/s/^.*$/#define PACKAGE_VERSION "26.1.91"/
 /^#undef SYSTEM_TYPE/s/^.*$/#define SYSTEM_TYPE "ms-dos"/
 /^#undef HAVE_DECL_GETENV/s/^.*$/#define HAVE_DECL_GETENV 1/
 /^#undef SYS_SIGLIST_DECLARED/s/^.*$/#define SYS_SIGLIST_DECLARED 1/
diff --git a/nt/README.W32 b/nt/README.W32
index d9f7e23a18..617f707451 100644
--- a/nt/README.W32
+++ b/nt/README.W32
@@ -1,7 +1,7 @@
 Copyright (C) 2001-2019 Free Software Foundation, Inc.
 See the end of the file for license conditions.
 
-		Emacs version 26.1.90 for MS-Windows
+		Emacs version 26.1.91 for MS-Windows
 
   This README file describes how to set up and run a precompiled
   distribution of the latest version of GNU Emacs for MS-Windows.  You

commit f1ce72b7c6cd53265c1a3fa11d1111e44c16bf52
Author: Nicolas Petton <nicolas@petton.fr>
Date:   Mon Jan 7 15:36:57 2019 +0100

    ; ChangeLog.3 update

diff --git a/ChangeLog.3 b/ChangeLog.3
index decee10a4e..35866c87a5 100644
--- a/ChangeLog.3
+++ b/ChangeLog.3
@@ -1,3 +1,736 @@
+2019-01-07  Leo Liu  <sdl.web@gmail.com>
+
+	* lisp/textmodes/mhtml-mode.el: Avoid loading flyspell.  (Bug#33939)
+
+2019-01-05  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Improve GC+Cairo workaround
+
+	Suggested by Eli Zaretskii (Bug#20890#31).
+	* src/font.h (font_data_structures_may_be_ill_formed): New function.
+	* src/ftfont.c (ftfont_close):
+	* src/ftcrfont.c (ftcrfont_close): Use it.
+
+	(cherry picked from commit d02fd482fbeaf6ed551e78223b538495cb0c3541)
+
+2019-01-05  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Work around GC+Cairo bug
+
+	Workaround suggested by Robert Pluim (Bug#20890#13).
+	* src/ftfont.c (ftfont_close) [USE_CAIRO]:
+	Do nothing if GC is in progress.
+
+2019-01-05  Eli Zaretskii  <eliz@gnu.org>
+
+	Improve commentary in font.h
+
+	* src/font.h (struct font, struct font_driver): Fix typos and
+	wording in comments.  Document all driver methods.
+
+2019-01-04  Martin Rudalics  <rudalics@gmx.at>
+
+	Fix definition of Qwindow_point_insertion_type (Bug#33871)
+
+	* src/window.c (Qwindow_point_insertion_type): Fix definition
+	(Bug#33871).
+
+2019-01-04  Eli Zaretskii  <eliz@gnu.org>
+
+	Improve documentation of 'server-name'
+
+	* doc/emacs/misc.texi (Emacs Server, TCP Emacs server)
+	(emacsclient Options):
+	* lisp/server.el (server-name):  Document the usage of
+	'server-name' to specify the server file as an absolute file
+	name.  Do not merge to master.  (Bug#33934)
+
+2019-01-04  Eli Zaretskii  <eliz@gnu.org>
+
+	Update Unicode copyright notice
+
+	* admin/unidata/copyright.html: Updated version from the
+	Unicode Consortium's site.
+
+2019-01-02  Michael Albinus  <michael.albinus@gmx.de>
+
+	Handle quoted file names in filenotify.el
+
+	* lisp/filenotify.el (file-notify-add-watch): Do not save
+	quoted file names in `file-notify-descriptors'.
+
+	* test/lisp/files-tests.el
+	(files-file-name-non-special-notify-handlers): Do not expect
+	to fail.
+
+2019-01-01  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Fix copyright years by hand
+
+	These are dates that admin/update-copyright did not update, or
+	updated incorrectly.
+
+2019-01-01  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Update copyright year to 2019
+
+	Run 'TZ=UTC0 admin/update-copyright $(git ls-files)'.
+
+2018-12-31  Eli Zaretskii  <eliz@gnu.org>
+
+	* doc/man/emacs.1.in: Fix value of default frame height.  (Bug#33921)
+
+2018-12-30  Martin Rudalics  <rudalics@gmx.at>
+
+	In user manual fix value of default frame height (Bug#33921)
+
+	* doc/emacs/cmdargs.texi (Window Size X): Fix value of default
+	frame height (Bug#33921).
+
+2018-12-29  Eli Zaretskii  <eliz@gnu.org>
+
+	Improve documentation of 'file-local-name' and related APIs
+
+	* doc/lispref/files.texi (Unique File Names)
+	(Magic File Names, File Name Expansion): Improve documentation
+	of the "local part" of a remote file name.
+	* doc/lispref/processes.texi (Synchronous Processes)
+	(Asynchronous Processes): State explicitly that program and
+	file names passed to functions that start remote processes
+	need to be relative or obtained by 'file-local-name'.
+
+	* lisp/files.el (file-local-name):
+	* lisp/simple.el (start-file-process, process-file): Improve
+	the documentation of the "local part" of a remote file name,
+	and its use in APIs that start remote processes.
+
+2018-12-29  Michael Albinus  <michael.albinus@gmx.de>
+
+	Fix Bug#31704.  Do not merge
+
+	* lisp/net/tramp.el (tramp-eshell-directory-change):
+	Use `path-separator' as it does eshell.  (Bug#31704)
+
+2018-12-29  Michael Albinus  <michael.albinus@gmx.de>
+
+	Fix Bug#31704.  Do not merge
+
+	* lisp/eshell/esh-proc.el (eshell-gather-process-output): Do not
+	let `expand-file-name' prefix remote file names with MS Windows
+	volume letter.
+
+	* lisp/net/tramp.el (tramp-eshell-directory-change):
+	Use `path-separator' as it does eshell.  (Bug#31704)
+
+2018-12-29  Eli Zaretskii  <eliz@gnu.org>
+
+	* lisp/files.el (cd): Fix last change.  (Bug#33791)
+
+2018-12-29  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix remote directories in Eshell on MS-Windows
+
+	* lisp/files.el (cd): Support remote directory names on
+	MS-Windows.  (Bug#33791)
+
+2018-12-29  Drew Adams  <drew.adams@oracle.com>
+
+	Fix :type 'group' in defcustom
+
+	* lisp/wid-edit.el (group): Fix the :format spec.  (Bug#33566)
+
+2018-12-28  Alan Third  <alan@idiocy.org>
+
+	Fix NS fringe bitmap drawing bug (bug#33864)
+
+	* src/nsterm.m (ns_draw_fringe_bitmap): Check the rectangle to clear
+	correctly.
+
+2018-12-28  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix commentary in dispnew.c
+
+	* src/dispnew.c (buffer_posn_from_coords): Fix inaccuracies in
+	the commentary.
+
+2018-12-27  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Improve accept-process-process doc
+
+	* doc/lispref/processes.texi (Accepting Output):
+	* src/process.c (Faccept_process_output):
+	Document that (accept-process-output P) can return non-nil
+	even after P has exited, and that it can return nil even if P
+	is still running (Bug#33839).
+
+2018-12-23  Stephen Leake  <stephen_leake@stephe-leake.org>
+
+	Fix a simple bug in display-buffer-use-some-frame
+
+	* lisp/window.el (display-buffer-use-some-frame): Simplify the
+	predicate, fix TYPE arg to window--display-buffer.
+
+2018-12-23  Michael Albinus  <michael.albinus@gmx.de>
+
+	Clarify thread switching while waiting for process output
+
+	* doc/lispref/threads.texi (Threads): Clarify, that thread
+	switching happens when waiting for process output from
+	asynchronous processes.
+
+2018-12-22  Charles A. Roelli  <charles@aurox.ch>
+
+	Improve process doc. with respect to handling of large input (Bug#33191)
+
+	* src/process.c (Fprocess_send_region, Fprocess_send_string):
+	Document that process input longer than the process input
+	buffer may be split into bunches.  Remove an outdated
+	reference to a 500 character split boundary.
+	* doc/lispref/processes.texi (Asynchronous Processes): Remove
+	mention of "stray character injections" in PTY processes.  See
+	also the comment about ICANON in src/sysdep.c, function
+	child_setup_tty.
+
+2018-12-22  Terrence Brannon  <metaperl@gmail.com>
+
+	Minor copyedits in landmark.el
+
+	* lisp/obsolete/landmark.el: Fix author's email and commentary.
+
+2018-12-20  Alan Mackenzie  <acm@muc.de>
+
+	Check result from c-backward-token-2 to avoid infinite loop
+
+	This fixes bug #33784.
+
+	* lisp/progmodes/cc-fonts.el (c-get-fontification-context): While moving back
+	over enclosing parentheses, check that c-backward-token-2 actually moves.
+
+2018-12-19  Paul Eggert  <eggert@cs.ucla.edu>
+
+	cl-make-random-state was not copying its arg
+
+	Problem reported by Xu Chunyang (Bug#33731).
+	* lisp/emacs-lisp/cl-extra.el (cl-make-random-state):
+	Use copy-sequence, not copy-tree, so that the record is copied.
+	* test/lisp/emacs-lisp/cl-extra-tests.el:
+	(cl-extra-test-cl-make-random-state): New test.
+
+2018-12-19  Glenn Morris  <rgm@gnu.org>
+
+	Skip a vc-bzr test if run as root
+
+	* test/lisp/vc/vc-bzr-tests.el (vc-bzr-test-faulty-bzr-autoloads):
+	Skip this test when run as root.  This works around a race
+	condition in root-specific code in vc-mode-line when deleting a file.
+
+2018-12-19  Chris Feng  <chris.w.feng@gmail.com>
+
+	Backport: Handle unread-command-events consistently (bug#23980)
+
+	* src/keyboard.c (read_char): Events put into `unread-command-events'
+	with the form (t . EVENT) should always have the t stripped when read
+	out.
+	* test/src/keyboard-tests.el: New tests for `unread-command-events'.
+
+	(cherry picked from commit 1f3f4b1296613b8cdc0632a68fde86e86ddad866)
+
+2018-12-19  Glenn Morris  <rgm@gnu.org>
+
+	Restrict downcasing in elisp xref tests (bug#25534)
+
+	The tests happen to not fail at the moment because find-library-name
+	now has an extra feature, find-library--from-load-history, which
+	happens to do a case-insensitive regexp match; but still it seems
+	better not to rely on this.
+
+	* test/lisp/progmodes/elisp-mode-tests.el (xref--case-insensitive):
+	New variable.
+	(xref-elisp-test-run, emacs-test-dir): Only downcase if the
+	filesystem seems to be case-insensitive.
+
+2018-12-18  Rob Browning  <rlb@defaultvalue.org>
+
+	Avoid test failures if directory name looks like a regexp
+
+	Taken from <https://sources.debian.org/patches/emacs/1:26.1+1-1>
+	* test/lisp/ibuffer-tests.el (ibuffer-filter-inclusion-3):
+	* test/lisp/net/tramp-tests.el (tramp-test42-remote-load-path):
+	Regexp-quote file names to avoid failures with directory names
+	of the form "build/emacs-i87jK3/emacs-26.1+1/...".
+
+2018-12-18  Michael Albinus  <michael.albinus@gmx.de>
+
+	Fix Bug#33524
+
+	* lisp/progmodes/flymake-proc.el
+	(flymake-proc-create-temp-with-folder-structure):
+	Unquote file-name.  (Bug#33524)
+
+2018-12-17  Glenn Morris  <rgm@gnu.org>
+
+	* doc/lispintro/emacs-lisp-intro.texi (Finding More): Fix xref.
+
+2018-12-17  Paul Eggert  <eggert@cs.ucla.edu>
+
+	More porting to GCC 8 of --enable-gcc-warnings
+
+	Backport from master.
+	I ran into this when building Emacs 26 with GCC 8 on Fedora 29 x86.
+	* lwlib/lwlib-Xaw.h (xaw_update_one_value, xaw_popup_menu):
+	* lwlib/lwlib-Xlw.h (xlw_update_one_value, xlw_pop_instance):
+	* lwlib/lwlib.h (lw_allow_resizing, lw_set_main_areas) [!USE_MOTIF]:
+	No longer const.
+	* src/emacs-module.c: Ignore -Wcast-function-type.
+
+2018-12-15  Glenn Morris  <rgm@gnu.org>
+
+	Fix an epg test for recent GnuPG versions (bug#33439)
+
+	* test/lisp/epg-tests.el (epg-decrypt-1):
+	Tell recent GnuPG (e.g. 2.2.11) not to worry about missing MDC.
+
+2018-12-14  Robert Pluim  <rpluim@gmail.com>
+
+	Document font structure layout constraints
+
+	This has to be the same as in src/ftcrfont.c and src/ftfont.c
+
+	* src/xftfont.c (struct xftfont_info): Document layout constraints.
+
+2018-12-14  Robert Pluim  <rpluim@gmail.com>
+
+	Document font structure layout constraints
+
+	The layout of the initial members of ftcrfont_info must match
+	ftfont_info
+
+	* src/ftcrfont.c (struct ftcrfont_info): Likewise.
+
+	* src/ftfont.c (struct ftfont_info): Document layout constraints.
+
+2018-12-14  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix display of line numbers in empty lines beyond EOB
+
+	* src/xdisp.c (maybe_produce_line_number): When the current
+	line is at EOB, use the 'line-number-current-line' face only
+	on that single line, but not on the rest of empty lines beyond
+	EOB.  (Bug#33732)
+
+2018-12-11  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix redisplay when a window's scroll bar or fringes are changed
+
+	* src/window.c (set_window_fringes, set_window_scroll_bars):
+	Set windows_or_buffers_changed flag to cause immediate
+	thorough redisplay of a window when scroll bars or fringes are
+	changed.  (Bug#33694)
+
+2018-12-11  Martin Rudalics  <rudalics@gmx.at>
+
+	Tiny markup fix in Elisp manual
+
+	* doc/lispref/lists.texi (Building Lists): Use '@var' instead
+	of '@code' for argument.
+
+2018-12-10  Alan Mackenzie  <acm@muc.de>
+
+	CC Mode: stop extra parens on expression causing false fontification as type
+
+	* lisp/progmodes/cc-fonts.el (c-get-fontification-context): recognize
+	arithmetic operator followed by several open parentheses, not just one, as not
+	being an argument list.
+
+2018-12-10  Ari Roponen  <ari.roponen@gmail.com>
+
+	Fix cairo scrolling for side-by-side windows
+
+	Backport: Fixes Bug#33442.
+
+	* src/xterm.c (x_scroll_run) [USE_CAIRO]: Fix scrolling for
+	side-by-side split windows.  (Bug#31288)
+
+	(cherry picked from commit 6e362a32bc9d21f73a0f29ca6f45481edeea6f29)
+
+2018-12-10  Alan Mackenzie  <acm@muc.de>
+
+	CC Mode: stop wrongly recognizing "func(a * 9)" as "pointer to type a"
+
+	* lisp/progmodes/cc-engine.el (c-forward-decl-or-cast-1): When testing for an
+	identifier after "a *", on failure additionally check for a digit, setting a
+	new flag variable got-number if one is found.  In the test for CASE 18, check
+	this flag.
+
+2018-12-10  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* lisp/emacs-lisp/cursor-sensor.el: Add motivation
+
+2018-12-10  Raimon Grau  <raimonster@gmail.com>
+
+	Guard occur against an undefined orig-line
+
+	* lisp/replace.el (occur-engine): Avoid inserting the current line if
+	orig-line is nil.  This happens, for example, when reverting an occur
+	buffer with `list-matching-lines-jump-to-current-line' set to t.
+	(Bug#33476)
+
+2018-12-09  Eli Zaretskii  <eliz@gnu.org>
+
+	Indexing followup to recent changes
+
+	* doc/lispref/text.texi (Special Properties): Index
+	'cursor-sensor-inhibit'.  (Bug#33664)
+
+2018-12-09  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	Improve documentation of cursor-sensor.el (bug#33664)
+
+	* doc/lispref/text.texi (Special Properties): Mention cursor-sensor-inhibit.
+	* lisp/emacs-lisp/cursor-sensor.el (Commentary): Add cursor-sensor-mode.
+	(cursor-sensor-inhibit): Add docstring.
+
+2018-12-09  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* doc/lispref/commands.texi (Adjusting Point): Bug#33662
+
+	Tweak text to clarify intangibility.
+
+2018-12-09  Michael Albinus  <michael.albinus@gmx.de>
+
+	Tramp multi-hop methods must be inline
+
+	* doc/misc/tramp.texi (Ad-hoc multi-hops): Involved methods must
+	be inline methods.
+
+2018-12-08  Ari Roponen  <ari.roponen@gmail.com>
+
+	Fix scaling problem in Cairo builds
+
+	* src/xterm.c (x_begin_cr_clip) [USE_GTK]:
+	(x_update_begin) [USE_CAIRO && USE_GTK]: Support scaling.
+	(Bug#33442)
+
+2018-12-06  Juri Linkov  <juri@linkov.net>
+
+	* lisp/simple.el (next-line-or-history-element): Use current-column
+
+	in all position calculations.
+	(previous-line-or-history-element): Idem.  (Bug#33640)
+
+2018-12-03  Martin Rudalics  <rudalics@gmx.at>
+
+	A few further fixes of window internals description
+
+	* doc/lispref/internals.texi (Window Internals): Add a few
+	more items and clarify description of some others.
+
+2018-12-02  Eli Zaretskii  <eliz@gnu.org>
+
+	Revert "Revert "Fix infloop in GC mark_kboards""
+
+	This reverts commit c418c85617babbe7b63730fefb71e2c87a0141af.
+	This reinstates the original fix, as it had nothing to do
+	with the behavior reported in bug#33571, which seems to be
+	the expected behavior.
+
+2018-12-02  Eli Zaretskii  <eliz@gnu.org>
+
+	Revert "Fix infloop in GC mark_kboards"
+
+	This reverts commit af914fc26db273d8788e7efa57c569f0f778d037,
+	since it caused unintended adverse effects on echoing of keys.
+	(Bug#33571)
+
+2018-12-02  Glenn Morris  <rgm@gnu.org>
+
+	* lisp/emacs-lisp/subr-x.el (if-let, when-let): Doc fix: active voice.
+
+2018-12-01  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Fix infloop in GC mark_kboards
+
+	Do not merge to master, as I have a more systematic fix there.
+	* src/keyboard.c (mark_kboards): Fix infloop (Bug#33547).
+
+2018-12-01  Alan Third  <alan@idiocy.org>
+
+	Fix macOS run-time feature check
+
+	* src/nsterm.m (x_set_parent_frame) [NS_IMPL_COCOA]: Fix run-time
+	feature check.
+
+2018-12-01  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* etc/NEWS-*: Fix capitalization of "Emacs"
+
+2018-12-01  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix "M-x man" when there's no 'man' program on PATH
+
+	* lisp/man.el (Man-bgproc-sentinel): Make sure the process
+	buffer is not read-only when inserting a message into it.
+	(Bug#33510)
+
+2018-11-30  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Fix core dump in dbus-message-internal
+
+	Backport from master.
+	* src/dbusbind.c (Fdbus_message_internal):
+	Don’t go past array end (Bug#33530).
+
+2018-11-30  Michael Albinus  <michael.albinus@gmx.de>
+
+	* doc/misc/dbus.texi (Type Conversion): Fix typo.  (Bug#33551)
+
+2018-11-30  Eli Zaretskii  <eliz@gnu.org>
+
+	Improve documentation of gdb-mi.el
+
+	* lisp/progmodes/gdb-mi.el (gdb-show-changed-values)
+	(gdb-max-children): Doc fixes.
+
+	* doc/emacs/building.texi (Source Buffers, Stack Buffer)
+	(GDB User Interface Layout): Mention some additional
+	customizable variables.  (Bug#33548)
+
+2018-11-29  Thomas Fitzsimmons  <fitzsim@fitzsim.org>
+
+	LDAP: Set process-connection-type to t on Darwin
+
+	* lisp/net/ldap.el (ldap-search-internal): Set
+	process-connection-type to t on Darwin.  Do not merge to
+	master.  (Bug#33050)
+
+2018-11-28  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix a typo in a doc string
+
+	* lisp/emacs-lisp/map-ynp.el (read-answer-short): Fix typo.
+	(Bug#33528)
+
+2018-11-28  Eli Zaretskii  <eliz@gnu.org>
+
+	Minor markup fix in frames.texi
+
+	* doc/lispref/frames.texi (Frame Layout): Fix markup of @table
+	entries.  (Bug#33531)
+
+2018-11-28  Glenn Morris  <rgm@gnu.org>
+
+	* lisp/net/trampver.el (customize-package-emacs-version-alist):
+	Add 2.3.3.
+
+	* lisp/mh-e/mh-e.el (customize-package-emacs-version-alist): Additions.
+
+2018-11-27  Glenn Morris  <rgm@gnu.org>
+
+	* lisp/emacs-lisp/map-ynp.el (map-y-or-n-p): Pass format to message.
+
+2018-11-27  Robert Pluim  <rpluim@gmail.com>
+
+	Don't call xwidget functions until GTK has been initialized
+
+	Follow up fix to Bug#33294.
+
+	* src/gtkutil.c: Define xg_gtk_initialized.
+	(xg_initialize): Set it when GTK has finished initializing.
+
+	* src/gtkutil.h: Declare xg_gtk_initialized.
+
+	* src/xwidget.c (Fmake_xwidget): Error out if GTK has not been
+	initialized.
+	(xwidget_init_view): Likewise.
+
+2018-11-27  Eli Zaretskii  <eliz@gnu.org>
+
+	Improve documentation of Ediff wordwise commands
+
+	* lisp/vc/ediff.el (ediff-windows-wordwise)
+	(ediff-windows-linewise, ediff-regions-wordwise): Update and
+	clarify the doc strings.
+
+	* doc/misc/ediff.texi (Major Entry Points): Update and clarify
+	the documentation of 'ediff-windows-wordwise' and
+	'ediff-regions-wordwise'.  See the discussion starting at
+	https://lists.gnu.org/archive/html/help-gnu-emacs/2018-11/msg00197.html
+	for the details.
+
+2018-11-26  Eli Zaretskii  <eliz@gnu.org>
+
+	Support Hunspell 1.7.0 in ispell.el
+
+	* lisp/textmodes/ispell.el
+	(ispell-find-hunspell-dictionaries): Invoke Hunspell with an
+	additional command-line argument, to work around a misfeature
+	in Hunspell 1.7.0 that prevents it from reporting the loaded
+	dictionary.  (Bug#33493)
+
+2018-11-26  Eli Zaretskii  <eliz@gnu.org>
+
+	Avoid clearing echo-area message by auto-save-visited-file-name
+
+	* lisp/emacs-lisp/map-ynp.el (map-y-or-n-p): Record the
+	previous echo-area message, if any, and restore it before
+	exiting.  (Bug#33490)
+
+2018-11-25  Alan Third  <alan@idiocy.org>
+
+	Set tooltip text color (bug#33452)
+
+
+	* src/nsmenu.m: ([EmacsTooltip init]): Set text color to black.
+
+2018-11-25  Alan Third  <alan@idiocy.org>
+
+	Fix more drawing bugs in NS port (bug#32932)
+
+	* src/nsterm.m (ns_row_rect): New function.
+	(ns_clip_to_row): Remove function.
+	(ns_copy_bits): Fix mistake.
+	(ns_shift_glyphs_for_insert): Mark the frame as dirty instead of
+	directly copying.
+	(ns_draw_fringe_bitmap): Stop using ns_clip_to_row.
+	(ns_draw_window_cursor): Stop using ns_clip_to_row and perform a
+	display when not in redisplay.
+	(ns_update_window_begin): Remove redundant code that never executes.
+	([EmacsView drawRect:]): Show the rectangle being exposed in NSTRACE.
+	* src/xdisp.c (expose_window_tree) [HAVE_NS]:
+	(expose_frame) [HAVE_NS]: Redraw even if the frame is garbaged.
+
+2018-11-24  Alan Mackenzie  <acm@muc.de>
+
+	Fix bug #33416, where typing a ) in a comment at EOB caused a loop (CC Mode).
+
+	* lisp/progmodes/cc-mode.el (c-fl-decl-start): A c-forward-syntactic-ws leaves
+	point inside whitespace when moving over a comment at EOB which has no
+	terminating LF.  Check this possibility and correct for it.
+
+2018-11-24  Ulrich Müller  <ulm@gentoo.org>
+
+	Update the calc units table
+
+	On 2018-11-16, the 26th meeting of the General Conference on Weights
+	and Measures (CGPM) has redefined the International System of Units by
+	adopting fixed values for the Planck constant, the elementary charge,
+	the Boltzmann constant, and the Avogadro constant:
+	https://www.bipm.org/utils/en/pdf/CGPM/Draft-Resolution-A-EN.pdf
+
+	* lisp/calc/calc-units.el (math-standard-units): Update according
+	to redefinition of the SI in 2018.  (Bug#33412)
+
+2018-11-24  Eli Zaretskii  <eliz@gnu.org>
+
+	Improve indexing in the ELisp manual
+
+	* doc/lispref/control.texi (Control Structures, Sequencing)
+	(Conditionals, Iteration, Catch and Throw, Handling Errors)
+	(Cleanups):
+	* doc/lispref/eval.texi (Self-Evaluating Forms)
+	(Symbol Forms, Function Forms, Macro Forms, Special Forms)
+	(Quoting, Backquote): Add index entries that begin with
+	"forms".  (Bug#33440)
+
+2018-11-23  Eli Zaretskii  <eliz@gnu.org>
+
+	More Symbola-related extensions for default fontset
+
+	* lisp/international/fontset.el (setup-default-fontset): Add
+	few more blocks of symbols and punctuation supported by	latest
+	Symbola.
+
+2018-11-23  Eli Zaretskii  <eliz@gnu.org>
+
+	Better support for display of U+1F900..U+1F9FF block
+
+	* lisp/international/fontset.el (setup-default-fontset): Add
+	the [#x1F900..#x1F9FF] block to those supported by Symbola.
+
+2018-11-23  Eli Zaretskii  <eliz@gnu.org>
+
+	Improve documentation of 'edit-abbrevs-mode'
+
+	* lisp/abbrev.el (edit-abbrevs-mode): Refer to 'edit-abbrevs'
+	for more detailed usage information.  (Bug#33443)
+	(edit-abbrevs): Doc fix.
+
+2018-11-22  Eli Zaretskii  <eliz@gnu.org>
+
+	Improve documentation of 'dired-do-compress'
+
+	* lisp/dired-aux.el (dired-do-compress): Describe in the doc
+	string the effect on directories and on compressed archive.
+	(Bug#33450)
+
+2018-11-22  Eli Zaretskii  <eliz@gnu.org>
+
+	Improve doc string and display of 'describe-character'
+
+	* lisp/descr-text.el (describe-char): Explain how does the
+	function obtain the various data about the character.  Don't
+	display "preferred" before "charset": it tends to confuse
+	people.
+
+2018-11-21  Eli Zaretskii  <eliz@gnu.org>
+
+	* etc/NEWS: Clarify what 'Z' does in Dired.  (Bug#33450)
+
+2018-11-20  Eli Zaretskii  <eliz@gnu.org>
+
+	Update the docs of object internals
+
+	* doc/lispref/internals.texi (Buffer Internals)
+	(Window Internals, Process Internals): Update the descriptions
+	of Lisp objects.
+
+2018-11-19  Stephen Berman  <stephen.berman@gmx.net>
+
+	Fix two Edebug defcustoms (bug#33428)
+
+	* lisp/emacs-lisp/edebug.el (edebug-print-length)
+	(edebug-print-level): Fix customization type to allow setting
+	the documented valid value nil via the Customize interface.
+
+2018-11-19  Michael Albinus  <michael.albinus@gmx.de>
+
+	Fix Bug#33141
+
+	* lisp/net/tramp.el (tramp-make-tramp-file-name): Avoid check for
+	empty method with simplified `tramp-syntax'.  (Bug#33141)
+
+2018-11-19  Eli Zaretskii  <eliz@gnu.org>
+
+	Improve documentation of the window tree
+
+	* doc/lispref/windows.texi (Windows and Frames): More accurate
+	wording regarding the relation of a mini-window to its frame's
+	window tree.
+
+	* src/window.h (struct window): Improve commentary to some
+	fields.
+
+2018-11-19  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix window scrolling on TTY frames when there's no mode line
+
+	* src/window.c (window_internal_height): Remove tests for
+	next, prev, and parent pointers, as they are unrelated to
+	whether a window has a mode line.  (Bug#33363)
+
+2018-11-19  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix decoding XML files encoded in ISO-8859
+
+	* lisp/international/mule.el (sgml-xml-auto-coding-function):
+	Avoid signaling an error from coding-system-equal when the XML
+	encoding tag specifies an encoding whose type is 'charset'.
+	(Bug#33429)
+
+2018-11-19  Nicolas Petton  <nicolas@petton.fr>
+
+	* etc/AUTHORS: Update.
+
 2018-11-18  Martin Rudalics  <rudalics@gmx.at>
 
 	Fix description of some window hooks
@@ -63448,7 +64181,7 @@
 
 This file records repository revisions from
 commit 9d56a21e6a696ad19ac65c4b405aeca44785884a (exclusive) to
-commit 72525076996cd709086b1afb47ab0d095322e9b7 (inclusive).
+commit 2cf20b67cf6836dd7bd80077042068afa0d7b04f (inclusive).
 See ChangeLog.1 for earlier changes.
 
 ;; Local Variables:

commit 5b59cf0d06dede1d5a82a0557024874239070321
Author: Nicolas Petton <nicolas@petton.fr>
Date:   Mon Jan 7 15:35:02 2019 +0100

    * etc/AUTHORS: Update.

diff --git a/etc/AUTHORS b/etc/AUTHORS
index 07cdf0acfc..0f4ec253dc 100644
--- a/etc/AUTHORS
+++ b/etc/AUTHORS
@@ -109,8 +109,8 @@ Alan Shutko: changed diary-lib.el calendar.el bindings.el cal-hebrew.el
 Alan Third: wrote dabbrev-tests.el
 and changed nsterm.m nsfns.m nsterm.h nsmenu.m frame.el macfont.m
   nsimage.m ns-win.el Info.plist.in conf_post.h frame.c frame.h
-  frames.texi keyboard.c macfont.h macos.texi picture.el rect.el
-  battery.el callproc.c configure.ac and 12 other files
+  frames.texi keyboard.c macfont.h macos.texi picture.el rect.el xdisp.c
+  battery.el callproc.c and 12 other files
 
 Alastair Burt: changed gnus-art.el smiley.el
 
@@ -366,8 +366,8 @@ Antonin Houska: changed newcomment.el
 Arash Esbati: changed reftex-vars.el reftex.el reftex-auc.el
   reftex-ref.el
 
-Ari Roponen: changed atimer.c doc.c hash.texi image.c mule.texi
-  package.el startup.el subr.el svg.el time-date.el woman.el xterm.c
+Ari Roponen: changed xterm.c atimer.c doc.c hash.texi image.c mule.texi
+  package.el startup.el subr.el svg.el time-date.el woman.el
 
 Arisawa Akihiro: changed characters.el coding.c epa-file.el japan-util.el
   language/tibetan.el message.el mm-decode.el mm-view.el ps-print.el
@@ -673,7 +673,7 @@ Chao-Hong Liu: changed TUTORIAL.cn TUTORIAL.zh
 Charles A. Roelli: changed nsterm.m display.texi isearch.el nsfns.m
   nsterm.h org-clock.el search.texi simple.el DEBUG INSTALL add-log.el
   anti.texi buffers.texi comint.el data.c diff-mode.el eldoc.el files.el
-  fill.el find-func.el flymake.el and 19 other files
+  fill.el find-func.el flymake.el and 21 other files
 
 Charles Hannum: changed aix3-1.h aix3-2.h configure ibmrs6000.h
   keyboard.c netbsd.h pop.c sysdep.c systime.h systty.h xrdb.c
@@ -699,11 +699,12 @@ and co-wrote longlines.el tango-dark-theme.el tango-theme.el
 and changed simple.el display.texi xdisp.c files.el frames.texi
   cus-edit.el files.texi custom.el subr.el text.texi faces.el keyboard.c
   startup.el package.el misc.texi emacs.texi modes.texi mouse.el
-  custom.texi image.c window.el and 935 other files
+  custom.texi image.c window.el and 936 other files
 
 Chris Chase: co-wrote idlw-shell.el idlwave.el
 
-Chris Feng: changed dispnew.c autoload.el frame.c process.c
+Chris Feng: changed dispnew.c autoload.el frame.c keyboard-tests.el
+  keyboard.c process.c
 
 Chris Foote: changed progmodes/python.el
 
@@ -1293,7 +1294,7 @@ and co-wrote color.el
 and changed cus-edit.el dired.el faces.el files.el help-mode.el imenu.el
   info.el isearch.el ls-lisp.el menu-bar.el modes.texi mouse.el
   ange-ftp.el apropos.el bindings.el bookmark.el custom.el descr-text.el
-  dired.texi etags.el finder.el and 14 other files
+  dired.texi etags.el finder.el and 15 other files
 
 E. Choroba: changed simple.el
 
@@ -1347,8 +1348,8 @@ Eli Zaretskii: wrote [bidirectional display in xdisp.c]
   tty-colors.el
 and changed xdisp.c msdos.c w32.c display.texi w32fns.c simple.el
   files.el fileio.c keyboard.c w32proc.c files.texi w32term.c text.texi
-  dispnew.c emacs.c frames.texi dispextern.h lisp.h process.c term.c
-  window.c and 1121 other files
+  dispnew.c frames.texi emacs.c dispextern.h lisp.h process.c term.c
+  window.c and 1124 other files
 
 Emanuele Giaquinta: changed configure.ac rxvt.el charset.c etags.c
   fontset.c frame.el gnus-faq.texi loadup.el lread.c sh-script.el
@@ -1433,7 +1434,7 @@ and changed c.srt ede.texi info.el rmail.el speedbspec.el cedet.el
   ede-autoconf.srt ede-make.srt eieio.texi gud.el sb-dir-minus.xpm
   sb-dir-plus.xpm sb-dir.xpm sb-mail.xpm sb-pg-minus.xpm sb-pg-plus.xpm
   sb-pg.xpm sb-tag-gt.xpm sb-tag-minus.xpm sb-tag-plus.xpm
-  sb-tag-type.xpm and 33 other files
+  sb-tag-type.xpm and 34 other files
 
 Eric Schulte: wrote ob-asymptote.el ob-awk.el ob-calc.el ob-comint.el
   ob-coq.el ob-css.el ob-ditaa.el ob-dot.el ob-emacs-lisp.el ob-eval.el
@@ -1734,7 +1735,7 @@ and changed configure.ac Makefile.in src/Makefile.in calendar.el
   diary-lib.el lisp/Makefile.in files.el rmail.el make-dist
   progmodes/f90.el bytecomp.el simple.el authors.el admin.el emacs.texi
   misc/Makefile.in startup.el lib-src/Makefile.in ack.texi display.texi
-  cal-menu.el and 1680 other files
+  cal-menu.el and 1682 other files
 
 Glynn Clements: wrote gamegrid.el snake.el tetris.el
 
@@ -2545,7 +2546,7 @@ Juri Linkov: wrote files-x.el misearch.el replace-tests.el
 and changed isearch.el info.el replace.el simple.el progmodes/grep.el
   dired.el dired-aux.el progmodes/compile.el startup.el faces.el files.el
   menu-bar.el bindings.el display.texi descr-text.el desktop.el comint.el
-  image-mode.el ispell.el man.el cus-edit.el and 359 other files
+  image-mode.el ispell.el man.el cus-edit.el and 360 other files
 
 Jussi Lahdenniemi: changed w32fns.c ms-w32.h msdos.texi w32.c w32.h
   w32console.c w32heap.c w32inevt.c w32term.h
@@ -2567,7 +2568,7 @@ and co-wrote longlines.el tramp-sh.el tramp.el
 and changed message.el gnus-agent.el gnus-sum.el files.el nnmail.el
   tramp.texi nntp.el gnus.el simple.el ange-ftp.el dired.el paragraphs.el
   bindings.el files.texi gnus-art.el gnus-group.el man.el INSTALL
-  Makefile.in crisp.el fileio.c and 44 other files
+  Makefile.in crisp.el fileio.c and 45 other files
 
 Kailash C. Chowksey: changed HELLO ind-util.el kannada.el knd-util.el
   lisp/Makefile.in loadup.el
@@ -2915,7 +2916,7 @@ and changed octave.el ido.el rcirc.el files.el subr.el lisp-mode.el
   eldoc.el simple.el flymake.el smie.el abbrev.el progmodes/python.el
   cfengine.el cl-extra.el cl-macs.el emacs-lisp/cl-lib.el fns.c
   progmodes/compile.el register.el rng-valid.el thingatpt.el
-  and 165 other files
+  and 166 other files
 
 Leonard H. Tower Jr.: changed rnews.el rnewspost.el emacsbug.el
   rmailout.el sendmail.el
@@ -2954,7 +2955,7 @@ Luc Teirlinck: wrote help-at-pt.el
 and changed files.el autorevert.el cus-edit.el subr.el simple.el
   frames.texi startup.el display.texi files.texi dired.el comint.el
   modes.texi custom.texi emacs.texi fns.c frame.el ielm.el minibuf.texi
-  variables.texi buffers.texi commands.texi and 212 other files
+  variables.texi buffers.texi commands.texi and 213 other files
 
 Ludovic Courtès: wrote nnregistry.el
 and changed configure.ac gnus.texi loadup.el
@@ -3159,7 +3160,7 @@ Martin Pohlack: changed iimage.el pc-select.el
 Martin Rudalics: changed window.el window.c windows.texi frame.c
   frames.texi w32fns.c xdisp.c xterm.c w32term.c frame.el xfns.c help.el
   buffer.c display.texi cus-start.el dispnew.c frame.h mouse.el nsfns.m
-  window.h gtkutil.c and 201 other files
+  window.h gtkutil.c and 202 other files
 
 Martin Stjernholm: wrote cc-bytecomp.el
 and co-wrote cc-align.el cc-cmds.el cc-compat.el cc-defs.el cc-engine.el
@@ -3282,7 +3283,7 @@ and changed tramp.texi tramp-adb.el trampver.el trampver.texi dbusbind.c
   file-notify-tests.el ange-ftp.el files.el dbus.texi files.texi
   autorevert.el tramp-fish.el kqueue.c tramp-gw.el tramp-imap.el os.texi
   configure.ac lisp.h gfilenotify.c inotify.c keyboard.c
-  and 221 other files
+  and 222 other files
 
 Michael Ben-Gershon: changed acorn.h configure.ac riscix1-1.h riscix1-2.h
   unexec.c
@@ -3348,7 +3349,7 @@ Michael Olson: changed erc.el erc-backend.el Makefile erc-track.el
   erc-log.el erc-stamp.el erc-autoaway.el erc-dcc.el erc-goodies.el
   erc-list.el erc-compat.el erc-identd.el erc.texi ERC-NEWS erc-bbdb.el
   erc-match.el erc-notify.el erc-ibuffer.el erc-services.el remember.el
-  erc-button.el and 55 other files
+  erc-button.el and 56 other files
 
 Michael Piotrowski: changed gnus-art.el gnus-sum.el ps-print.el
 
@@ -3739,9 +3740,9 @@ and changed imenu.el make-mode.el
 Paul Eggert: wrote rcs2log
 and co-wrote cal-dst.el
 and changed lisp.h configure.ac alloc.c process.c fileio.c editfns.c
-  xdisp.c sysdep.c image.c keyboard.c emacs.c xterm.c data.c lread.c
+  xdisp.c sysdep.c keyboard.c image.c emacs.c xterm.c data.c lread.c
   fns.c callproc.c Makefile.in gnulib.mk eval.c buffer.c frame.c
-  and 1598 other files
+  and 1600 other files
 
 Paul Fisher: changed fns.c
 
@@ -3976,7 +3977,7 @@ Rafael Sepúlveda: changed TUTORIAL.es
 
 Raffael Mancini: changed misc.el
 
-Raimon Grau: changed thingatpt.el
+Raimon Grau: changed replace.el thingatpt.el
 
 Rainer Orth: changed gtkutil.c lisp/Makefile.in
 
@@ -4115,7 +4116,7 @@ Rick Frankel: changed ox-html.el ob-sql.el org.texi
 Rick Sladkey: wrote backquote.el
 and changed gud.el intervals.c intervals.h simple.el
 
-Rob Browning: changed tls.el configure.ac
+Rob Browning: changed tls.el configure.ac ibuffer-tests.el tramp-tests.el
 
 Rob Christie: changed nsmenu.m
 
@@ -4144,10 +4145,10 @@ Roberto Rodríguez: changed ada-mode.texi glossary.texi widget.texi
 
 Robert P. Goldman: changed org.texi ob-exp.el org.el ox-latex.el
 
-Robert Pluim: changed configure.ac files.texi gtkutil.c dired-x.texi
-  misc.texi vc-git.el xfns.c xterm.c bindings.el desktop.el efaq.texi
-  epa.texi filelock.c font.c ftfont.c gnus-agent.el gnus-demon.el
-  gnus.texi ido.el image-mode.el mail-source.el and 15 other files
+Robert Pluim: changed gtkutil.c configure.ac files.texi dired-x.texi
+  ftfont.c misc.texi vc-git.el xfns.c xterm.c bindings.el desktop.el
+  efaq.texi epa.texi filelock.c font.c ftcrfont.c gnus-agent.el
+  gnus-demon.el gnus.texi gtkutil.h ido.el and 19 other files
 
 Robert Thorpe: changed cus-start.el indent.el
 
@@ -4530,7 +4531,7 @@ and changed todo-mode.texi diary-lib.el dired-tests.el doc-view.el
   files.el minibuffer.el wdired-tests.el dired.el frames.texi hl-line.el
   info.el menu-bar.el mouse.el otodo-mode.el subr.el .gitattributes
   allout.el artist.el compile.texi cus-start.el descr-text.el
-  and 41 other files
+  and 43 other files
 
 Stephen C. Gilardi: changed configure.ac
 
@@ -4551,8 +4552,8 @@ and changed time-stamp.el mh-e.el mh-comp.el mh-utils.el mh-customize.el
 Stephen J. Turnbull: changed ediff-init.el strings.texi subr.el
 
 Stephen Leake: wrote elisp-mode-tests.el
-and changed ada-mode.el ada-xref.el elisp-mode.el mode-local.el xref.el
-  CONTRIBUTE vc-mtn.el window.el ada-mode.texi ada-prj.el cedet-global.el
+and changed ada-mode.el ada-xref.el elisp-mode.el mode-local.el window.el
+  xref.el CONTRIBUTE vc-mtn.el ada-mode.texi ada-prj.el cedet-global.el
   ede/generic.el ada-stmt.el cl-generic.el ede/locate.el files.texi
   project.el windows.texi INSTALL.REPO INSTALL.W64 align.el
   and 21 other files
@@ -4696,7 +4697,7 @@ Teodor Zlatanov: wrote auth-source.el gnus-registry.el gnus-tests.el
 and changed spam.el gnus.el nnimap.el gnus.texi gnutls.c gnus-sum.el
   auth.texi cfengine.el gnus-sync.el gnus-util.el gnus-start.el netrc.el
   gnutls.h message.el spam-stat.el encrypt.el mail-source.el nnir.el
-  nnmail.el auth-source-tests.el configure.ac and 120 other files
+  nnmail.el auth-source-tests.el configure.ac and 121 other files
 
 Terje Rosten: changed xfns.c version.el xterm.c xterm.h
 
@@ -4956,9 +4957,9 @@ and changed org-gnus.el smime.el
 Ulrich Leodolter: changed w32proc.c
 
 Ulrich Müller: changed configure.ac lib-src/Makefile.in src/Makefile.in
-  version.el doctor.el emacs.1 files.el gamegrid.el gud.el server.el
-  ChgPane.c ChgSel.c HELLO INSTALL Makefile.in XMakeAssoc.c authors.el
-  bytecomp.el calc-units.el case-table.el configure and 39 other files
+  version.el calc-units.el doctor.el emacs.1 files.el gamegrid.el gud.el
+  server.el ChgPane.c ChgSel.c HELLO INSTALL Makefile.in XMakeAssoc.c
+  authors.el bytecomp.el case-table.el configure and 39 other files
 
 Ulrich Neumerkel: changed xterm.c
 

commit 536e6dea0f9302ef69d1bb12d0efc852c630d1ca
Author: Michael Albinus <michael.albinus@gmx.de>
Date:   Mon Jan 7 14:04:17 2019 +0100

    Adapt tests for emba
    
    * test/lisp/filenotify-tests.el (file-notify-test03-events)
    (file-notify-test05-file-validity)
    (file-notify-test06-dir-validity)
    (file-notify-test07-many-events)
    (file-notify-test09-watched-file-in-watched-dir): Adapt tests for emba.

diff --git a/test/lisp/filenotify-tests.el b/test/lisp/filenotify-tests.el
index 4be51afb47..fdc8d00d86 100644
--- a/test/lisp/filenotify-tests.el
+++ b/test/lisp/filenotify-tests.el
@@ -688,10 +688,9 @@ delivered."
 	      '(created deleted stopped))
 	     ((string-equal (file-notify--test-library) "kqueue")
 	      '(created changed deleted stopped))
-             ;; inotify on emba does not detect `deleted' and
-             ;; `stopped' events of the directory.
-             ((and (string-equal (file-notify--test-library) "inotify")
-                   (getenv "EMACS_EMBA_CI"))
+             ;; On emba, `deleted' and `stopped' events of the
+             ;; directory are not detected.
+             ((getenv "EMACS_EMBA_CI")
               '(created changed deleted))
 	     (t '(created changed deleted deleted stopped)))
 	  (write-region
@@ -738,10 +737,9 @@ delivered."
 	      '(created created changed changed deleted stopped))
 	     ((string-equal (file-notify--test-library) "kqueue")
 	      '(created changed created changed deleted stopped))
-             ;; inotify on emba does not detect `deleted' and
-             ;; `stopped' events of the directory.
-             ((and (string-equal (file-notify--test-library) "inotify")
-                   (getenv "EMACS_EMBA_CI"))
+             ;; On emba, `deleted' and `stopped' events of the
+             ;; directory are not detected.
+             ((getenv "EMACS_EMBA_CI")
               '(created changed created changed deleted deleted))
 	     (t '(created changed created changed
 		  deleted deleted deleted stopped)))
@@ -795,10 +793,9 @@ delivered."
 	      '(created created deleted deleted stopped))
 	     ((string-equal (file-notify--test-library) "kqueue")
 	      '(created changed renamed deleted stopped))
-             ;; inotify on emba does not detect `deleted' and
-             ;; `stopped' events of the directory.
-             ((and (string-equal (file-notify--test-library) "inotify")
-                   (getenv "EMACS_EMBA_CI"))
+             ;; On emba, `deleted' and `stopped' events of the
+             ;; directory are not detected.
+             ((getenv "EMACS_EMBA_CI")
               '(created changed renamed deleted))
 	     (t '(created changed renamed deleted deleted stopped)))
 	  (write-region
@@ -1017,10 +1014,8 @@ delivered."
     ;; Cleanup.
     (file-notify--test-cleanup))
 
-  ;; inotify on emba does not detect `deleted' and
-  ;; `stopped' events of the directory.
-  (unless (and (string-equal (file-notify--test-library) "inotify")
-               (getenv "EMACS_EMBA_CI"))
+  ;; On emba, `deleted' and `stopped' events of the directory are not detected.
+  (unless (getenv "EMACS_EMBA_CI")
     (unwind-protect
         (let ((file-notify--test-tmpdir
 	       (make-temp-file "file-notify-test-parent" t)))
@@ -1104,10 +1099,8 @@ delivered."
     ;; Cleanup.
     (file-notify--test-cleanup))
 
-  ;; inotify on emba does not detect `deleted' and
-  ;; `stopped' events of the directory.
-  (unless (and (string-equal (file-notify--test-library) "inotify")
-               (getenv "EMACS_EMBA_CI"))
+  ;; On emba, `deleted' and `stopped' events of the directory are not detected.
+  (unless (getenv "EMACS_EMBA_CI")
     (unwind-protect
         (progn
 	  (should
@@ -1199,8 +1192,7 @@ delivered."
             (delete-file file)))
         (delete-directory file-notify--test-tmpfile)
         (if (or (string-equal (file-notify--test-library) "w32notify")
-                (and (string-equal (file-notify--test-library) "inotify")
-                     (getenv "EMACS_EMBA_CI")))
+                (getenv "EMACS_EMBA_CI"))
             (file-notify--rm-descriptor file-notify--test-desc))
 
         ;; The environment shall be cleaned up.
@@ -1409,20 +1401,17 @@ the file watch."
 		  ;; w32notify does not raise `deleted' and `stopped'
 		  ;; events for the watched directory.
                   ((string-equal (file-notify--test-library) "w32notify") '())
-                  ;; inotify on emba does not detect `deleted' and
-                  ;; `stopped' events of the directory.
-                  ((and (string-equal (file-notify--test-library) "inotify")
-                        (getenv "EMACS_EMBA_CI"))
+                  ;; On emba, `deleted' and `stopped' events of the
+                  ;; directory are not detected.
+                  ((getenv "EMACS_EMBA_CI")
                    '())
                   (t '(deleted stopped))))))
           (delete-directory file-notify--test-tmpfile 'recursive))
-        (unless (and (string-equal (file-notify--test-library) "inotify")
-                     (getenv "EMACS_EMBA_CI"))
+        (unless (getenv "EMACS_EMBA_CI")
           (should-not (file-notify-valid-p file-notify--test-desc1))
           (should-not (file-notify-valid-p file-notify--test-desc2)))
         (when (or (string-equal (file-notify--test-library) "w32notify")
-                  (and (string-equal (file-notify--test-library) "inotify")
-                       (getenv "EMACS_EMBA_CI")))
+                  (getenv "EMACS_EMBA_CI"))
           (file-notify--rm-descriptor file-notify--test-desc1)
           (file-notify--rm-descriptor file-notify--test-desc2))
 

commit 2cf20b67cf6836dd7bd80077042068afa0d7b04f
Author: Leo Liu <sdl.web@gmail.com>
Date:   Mon Jan 7 07:22:45 2019 +0800

    * lisp/textmodes/mhtml-mode.el: Avoid loading flyspell.  (Bug#33939)

diff --git a/lisp/textmodes/mhtml-mode.el b/lisp/textmodes/mhtml-mode.el
index 70019ffd8d..17298ccf5f 100644
--- a/lisp/textmodes/mhtml-mode.el
+++ b/lisp/textmodes/mhtml-mode.el
@@ -21,13 +21,10 @@
 
 ;;; Code:
 
-(eval-and-compile
-  (require 'flyspell)
-  (require 'sgml-mode))
+(eval-and-compile (require 'sgml-mode))
 (require 'js)
 (require 'css-mode)
 (require 'prog-mode)
-(require 'font-lock)
 
 (defcustom mhtml-tag-relative-indent t
   "How <script> and <style> bodies are indented relative to the tag.
@@ -349,6 +346,8 @@ This is used by `mhtml--pre-command'.")
       ;; HTML.
       (sgml-indent-line))))
 
+(declare-function flyspell-generic-progmode-verify "flyspell")
+
 (defun mhtml--flyspell-check-word ()
   (let ((submode (get-text-property (point) 'mhtml-submode)))
     (if submode

commit 99e2ad9e4e5edeb91e739605c15dbf07f31143cc
Author: Paul Eggert <eggert@cs.ucla.edu>
Date:   Wed Apr 4 10:59:09 2018 -0700

    Improve GC+Cairo workaround
    
    Suggested by Eli Zaretskii (Bug#20890#31).
    * src/font.h (font_data_structures_may_be_ill_formed): New function.
    * src/ftfont.c (ftfont_close):
    * src/ftcrfont.c (ftcrfont_close): Use it.
    
    (cherry picked from commit d02fd482fbeaf6ed551e78223b538495cb0c3541)

diff --git a/src/font.h b/src/font.h
index bb468333e8..b6e43b0c9c 100644
--- a/src/font.h
+++ b/src/font.h
@@ -948,6 +948,22 @@ extern void font_deferred_log (const char *, Lisp_Object, Lisp_Object);
       font_deferred_log ((ACTION), (ARG), (RESULT));	\
   } while (false)
 
+/* FIXME: This is for use in functions that can be called while
+   garbage-collecting, but which assume that Lisp data structures are
+   properly-formed.  This invalid assumption can lead to core dumps
+   (Bug#20890).  */
+INLINE bool
+font_data_structures_may_be_ill_formed (void)
+{
+#ifdef USE_CAIRO
+  /* Although this works around Bug#20890, it is probably not the
+     right thing to do.  */
+  return gc_in_progress;
+#else
+  return false;
+#endif
+}
+
 INLINE_HEADER_END
 
 #endif	/* not EMACS_FONT_H */
diff --git a/src/ftcrfont.c b/src/ftcrfont.c
index 0e3490c570..62f44573a8 100644
--- a/src/ftcrfont.c
+++ b/src/ftcrfont.c
@@ -165,6 +165,9 @@ ftcrfont_open (struct frame *f, Lisp_Object entity, int pixel_size)
 static void
 ftcrfont_close (struct font *font)
 {
+  if (font_data_structures_may_be_ill_formed ())
+    return;
+
   struct ftcrfont_info *ftcrfont_info = (struct ftcrfont_info *) font;
   int i;
 
diff --git a/src/ftfont.c b/src/ftfont.c
index bdb1dff8cb..823fb2095c 100644
--- a/src/ftfont.c
+++ b/src/ftfont.c
@@ -1243,15 +1243,8 @@ ftfont_open (struct frame *f, Lisp_Object entity, int pixel_size)
 void
 ftfont_close (struct font *font)
 {
-  /* FIXME: Although this function can be called while garbage-collecting,
-     the function assumes that Lisp data structures are properly-formed.
-     This invalid assumption can lead to core dumps (Bug#20890).  */
-#ifdef USE_CAIRO
-  /* Although this works around Bug#20890, it is probably not the
-     right thing to do.  */
-  if (gc_in_progress)
+  if (font_data_structures_may_be_ill_formed ())
     return;
-#endif
 
   struct ftfont_info *ftfont_info = (struct ftfont_info *) font;
   Lisp_Object val, cache;

commit e0862eda47c549850a43f09d12882849a2073f93
Author: Paul Eggert <eggert@cs.ucla.edu>
Date:   Tue Apr 3 08:24:10 2018 -0700

    Work around GC+Cairo bug
    
    Workaround suggested by Robert Pluim (Bug#20890#13).
    * src/ftfont.c (ftfont_close) [USE_CAIRO]:
    Do nothing if GC is in progress.

diff --git a/src/ftfont.c b/src/ftfont.c
index 4382fd0221..bdb1dff8cb 100644
--- a/src/ftfont.c
+++ b/src/ftfont.c
@@ -1246,6 +1246,12 @@ ftfont_close (struct font *font)
   /* FIXME: Although this function can be called while garbage-collecting,
      the function assumes that Lisp data structures are properly-formed.
      This invalid assumption can lead to core dumps (Bug#20890).  */
+#ifdef USE_CAIRO
+  /* Although this works around Bug#20890, it is probably not the
+     right thing to do.  */
+  if (gc_in_progress)
+    return;
+#endif
 
   struct ftfont_info *ftfont_info = (struct ftfont_info *) font;
   Lisp_Object val, cache;

commit 0ecff00bc19c0f8e1b2c0b552a7a686525377dad
Author: Eli Zaretskii <eliz@gnu.org>
Date:   Sat Jan 5 10:28:34 2019 +0200

    Improve commentary in font.h
    
    * src/font.h (struct font, struct font_driver): Fix typos and
    wording in comments.  Document all driver methods.

diff --git a/src/font.h b/src/font.h
index d358110ce9..bb468333e8 100644
--- a/src/font.h
+++ b/src/font.h
@@ -284,7 +284,7 @@ struct font
   /* By which pixel size the font is opened.  */
   int pixel_size;
 
-  /* Height of the font.  On X window, this is the same as
+  /* Height of the font.  On X window system, this is the same as
      (font->ascent + font->descent).  */
   int height;
 
@@ -293,7 +293,7 @@ struct font
   int space_width;
 
   /* Average width of glyphs in the font.  If the font itself doesn't
-     have that information but has glyphs of ASCII characters, the
+     have that information, but has glyphs of ASCII characters, the
      value is the average width of those glyphs.  Otherwise, the value
      is 0.  */
   int average_width;
@@ -576,8 +576,8 @@ struct font_driver
      cons whose cdr part is the actual cache area.  */
   Lisp_Object (*get_cache) (struct frame *f);
 
-  /* List fonts exactly matching with FONT_SPEC on FRAME.  The value
-     is a list of font-entities.  The font properties to be considered
+  /* List fonts exactly matching FONT_SPEC on FRAME.  The value is
+     a list of font-entities.  The font properties to be considered
      are: :foundry, :family, :adstyle, :registry, :script, :lang, and
      :otf.  See the function `font-spec' for their meanings.  Note
      that the last three properties are stored in FONT_EXTRA_INDEX
@@ -593,19 +593,19 @@ struct font_driver
      The `open' method of the same font-backend is called with one of
      the returned font-entities.  If the backend needs additional
      information to be used in `open' method, this method can add any
-     Lispy value by the property :font-entity to the entities.
+     Lispy value using the property :font-entity to the entities.
 
      This and the following `match' are the only APIs that allocate
      font-entities.  */
   Lisp_Object (*list) (struct frame *frame, Lisp_Object font_spec);
 
-  /* Return a font-entity most closely matching with FONT_SPEC on
-     FRAME.  Which font property to consider, and how to calculate the
-     closeness is determined by the font backend, thus
+  /* Return a font-entity most closely matching FONT_SPEC on FRAME.
+     Which font property to consider, and how to calculate the
+     closeness, is determined by the font backend, thus
      `face-font-selection-order' is ignored here.
 
-     The properties that the font-entity has is the same as `list'
-     method.  */
+     The properties that the font-entity has are the same as described
+     for the `list' method above.  */
   Lisp_Object (*match) (struct frame *f, Lisp_Object spec);
 
   /* Optional.
@@ -630,7 +630,7 @@ struct font_driver
   void (*prepare_face) (struct frame *f, struct face *face);
 
   /* Optional.
-     Done FACE for displaying characters by FACE->font on frame F.  */
+     Done with FACE for displaying characters by FACE->font on frame F.  */
   void (*done_face) (struct frame *f, struct face *face);
 
   /* Optional.
@@ -662,8 +662,8 @@ struct font_driver
 
   /* Optional.
      Store bitmap data for glyph-code CODE of FONT in BITMAP.  It is
-     intended that this method is called from the other font-driver
-     for actual drawing.  */
+     intended that this method is called from other font-driver
+     methods for actual drawing.  */
   int (*get_bitmap) (struct font *font, unsigned code,
                      struct font_bitmap *bitmap,
                      int bits_per_pixel);
@@ -677,13 +677,16 @@ struct font_driver
   /* Optional.
      Get coordinates of the INDEXth anchor point of the glyph whose
      code is CODE.  Store the coordinates in *X and *Y.  Return 0 if
-     the operations was successful.  Otherwise return -1.  */
+     the operation was successful.  Otherwise return -1.  */
   int (*anchor_point) (struct font *font, unsigned code, int index,
                        int *x, int *y);
 
   /* Optional.
      Return a list describing which scripts/languages FONT
-     supports by which GSUB/GPOS features of OpenType tables.  */
+     supports by which GSUB/GPOS features of OpenType tables.
+     The list should be of the form (GSUB GPOS), where both
+     GSUB and GPOS are lists of the form
+     ((SCRIPT (LANGSYS FEATURE ...) ...) ...)  */
   Lisp_Object (*otf_capability) (struct font *font);
 
   /* Optional.
@@ -707,17 +710,16 @@ struct font_driver
 
   /* Optional.
      Make the font driver ready for frame F.  Usually this function
-     makes some data specific to F and stores it in F by calling
-     font_put_frame_data ().  */
+     makes some data specific to F and stores it in F's font_data
+     member by calling font_put_frame_data.  */
   int (*start_for_frame) (struct frame *f);
 
   /* Optional.
-     End using the driver for frame F.  Usually this function free
-     some data stored for F.  */
+     End using the driver for frame F.  Usually this function frees
+     some font data stored in frame F's font_data member.  */
   int (*end_for_frame) (struct frame *f);
 
   /* Optional.
-
      Shape text in GSTRING.  See the docstring of
      `composition-get-gstring' for the format of GSTRING.  If the
      (N+1)th element of GSTRING is nil, input of shaping is from the
@@ -728,19 +730,17 @@ struct font_driver
      output glyphs (M) are more than the input glyphs (N), (N+1)th
      through (M)th elements of GSTRING are updated possibly by making
      a new glyph object and storing it in GSTRING.  If (M) is greater
-     than the length of GSTRING, nil should be return.  In that case,
-     this function is called again with the larger GSTRING.  */
+     than the length of GSTRING, this method should return nil.  In
+     that case, the method is called again with a larger GSTRING.  */
   Lisp_Object (*shape) (Lisp_Object lgstring);
 
   /* Optional.
-
      If FONT is usable on frame F, return 0.  Otherwise return -1.
      This method is used only for debugging.  If this method is NULL,
      Emacs assumes that the font is usable on any frame.  */
   int (*check) (struct frame *f, struct font *font);
 
   /* Optional.
-
      Return the number of variation glyphs of character C supported by
      FONT.  VARIATIONS is an array of 256 elements.  If the variation
      selector N (1..256) defines a glyph, that glyph code is stored in
@@ -748,24 +748,27 @@ struct font_driver
   int (*get_variation_glyphs) (struct font *font,
                                int c, unsigned variations[256]);
 
+  /* Optional.
+     Set attributes of FONT according to PROPERTIES.
+     PROPERTIES is an alist of pairs (KEY . VALUE) that specifies
+     font properties.  This method should use font-put to set
+     properties of FONT supported by the font driver.
+     See font_filter_properties for more details.  */
   void (*filter_properties) (Lisp_Object font, Lisp_Object properties);
 
   /* Optional.
-
      Return non-zero if FONT_OBJECT can be used as a (cached) font
      for ENTITY on frame F.  */
   bool (*cached_font_ok) (struct frame *f,
                           Lisp_Object font_object,
                           Lisp_Object entity);
 
-  /* Optional
-
-     Return non-nil if the driver support rendering of combining
+  /* Optional.
+     Return non-nil if the driver supports rendering of combining
      characters for FONT according to Unicode combining class.  */
   Lisp_Object (*combining_capability) (struct font *font);
 
-  /* Optional
-
+  /* Optional.
      Called when frame F is double-buffered and its size changes; Xft
      relies on this hook to throw away its old XftDraw (which won't
      work after the size change) and get a new one.  */

commit a058edae5b02a5265524140e42004a84f5c86907
Author: Martin Rudalics <rudalics@gmx.at>
Date:   Fri Jan 4 17:34:00 2019 +0100

    Fix definition of Qwindow_point_insertion_type (Bug#33871)
    
    * src/window.c (Qwindow_point_insertion_type): Fix definition
    (Bug#33871).

diff --git a/src/window.c b/src/window.c
index 148200d5f5..7b879d0e1e 100644
--- a/src/window.c
+++ b/src/window.c
@@ -7646,7 +7646,7 @@ on their symbols to be controlled by this variable.  */);
   DEFVAR_LISP ("window-point-insertion-type", Vwindow_point_insertion_type,
 	       doc: /* Type of marker to use for `window-point'.  */);
   Vwindow_point_insertion_type = Qnil;
-  DEFSYM (Qwindow_point_insertion_type, "window_point_insertion_type");
+  DEFSYM (Qwindow_point_insertion_type, "window-point-insertion-type");
 
   DEFVAR_LISP ("window-configuration-change-hook",
 	       Vwindow_configuration_change_hook,

commit 775517307d9d5bb32cf6d58ae652e1e819aa95c3
Author: Eli Zaretskii <eliz@gnu.org>
Date:   Fri Jan 4 15:40:43 2019 +0200

    Improve documentation of 'server-name'
    
    * doc/emacs/misc.texi (Emacs Server, TCP Emacs server)
    (emacsclient Options):
    * lisp/server.el (server-name):  Document the usage of
    'server-name' to specify the server file as an absolute file
    name.  Do not merge to master.  (Bug#33934)

diff --git a/doc/emacs/misc.texi b/doc/emacs/misc.texi
index 41a540a761..2d1617ef96 100644
--- a/doc/emacs/misc.texi
+++ b/doc/emacs/misc.texi
@@ -1646,7 +1646,9 @@ each one a unique @dfn{server name}, using the variable
 @code{server-name}.  For example, @kbd{M-x set-variable @key{RET}
 server-name @key{RET} "foo" @key{RET}} sets the server name to
 @samp{foo}.  The @code{emacsclient} program can specify a server by
-name, using the @samp{-s} option (@pxref{emacsclient Options}).
+name, using the @samp{-s} or the @samp{-f} option (@pxref{emacsclient
+Options}), depending on whether or not the server uses a TCP socket
+(@pxref{TCP Emacs server}).
 
   If you want to run multiple Emacs daemons (@pxref{Initial Options}),
 you can give each daemon its own server name like this:
@@ -1711,18 +1713,20 @@ use @kbd{M-x server-generate-key} to get a random key.
   When you start a TCP Emacs server, Emacs creates a @dfn{server file}
 containing the TCP information to be used by @command{emacsclient} to
 connect to the server.  The variable @code{server-auth-dir} specifies
-the directory containing the server file; by default, this is
+the default directory containing the server file; by default, this is
 @file{~/.emacs.d/server/}.  In the absence of a local socket with file
 permissions, the permissions of this directory determine which users
 can have their @command{emacsclient} processes talk to the Emacs
-server.
+server.  If @code{server-name} is an absolute file name, the server
+file is created where specified by that file name.
 
 @vindex EMACS_SERVER_FILE@r{, environment variable}
   To tell @command{emacsclient} to connect to the server over TCP with
 a specific server file, use the @samp{-f} or @samp{--server-file}
 option, or set the @env{EMACS_SERVER_FILE} environment variable
 (@pxref{emacsclient Options}).  If @code{server-auth-dir} is set to a
-non-standard value, @command{emacsclient} needs an absolute file name
+non-standard value, or if @code{server-name} is set to an absolute
+file name, @command{emacsclient} needs an absolute file name
 to the server file, as the default @code{server-auth-dir} is
 hard-coded in @command{emacsclient} to be used as the directory for
 resolving relative filenames.
@@ -1914,10 +1918,13 @@ evaluation performed is for side-effect rather than result.
 
 @item -s @var{server-name}
 @itemx --socket-name=@var{server-name}
-Connect to the Emacs server named @var{server-name}.  The server name
-is given by the variable @code{server-name} on the Emacs server.  If
-this option is omitted, @command{emacsclient} connects to the first
-server it finds.  (This option is not supported on MS-Windows.)
+Connect to the Emacs server named @var{server-name}.  (This option is
+not supported on MS-Windows.)  The server name is given by the
+variable @code{server-name} on the Emacs server.  If this option is
+omitted, @command{emacsclient} connects to the first server it finds.
+If you set @code{server-name} of the Emacs server to an absolute file
+name, give the same absolute file name as @var{server-name} to this
+option to instruct @command{emacsclient} to connect to that server.
 
 @item -t
 @itemx --tty
diff --git a/lisp/server.el b/lisp/server.el
index 599f2728b9..a39b1cb46d 100644
--- a/lisp/server.el
+++ b/lisp/server.el
@@ -255,7 +255,14 @@ are done with it in the server.")
 (defcustom server-name "server"
   "The name of the Emacs server, if this Emacs process creates one.
 The command `server-start' makes use of this.  It should not be
-changed while a server is running."
+changed while a server is running.
+If this is a file name with no leading directories, Emacs will
+create a socket file by that name under `server-socket-dir'
+if `server-use-tcp' is nil, else under `server-auth-dir'.
+If this is an absolute file name, it specifies where the socket
+file will be created.  To have emacsclient connect to the same
+socket, use the \"-s\" switch for local non-TCP sockets, and
+the \"-f\" switch otherwise."
   :group 'server
   :type 'string
   :version "23.1")

commit 5f2aa328d158816aa4c40b1a6e603c6da9aff7b0
Author: Eli Zaretskii <eliz@gnu.org>
Date:   Fri Jan 4 10:48:01 2019 +0200

    Update Unicode copyright notice
    
    * admin/unidata/copyright.html: Updated version from the
    Unicode Consortium's site.

diff --git a/admin/unidata/copyright.html b/admin/unidata/copyright.html
index 0df59c120a..84322c8538 100644
--- a/admin/unidata/copyright.html
+++ b/admin/unidata/copyright.html
@@ -131,7 +131,7 @@ <h1>Unicode® Terms of Use</h1>
             <ol type="A">
               <li><u><a name="1"></a>Unicode Copyright.</u>
               <ol>
-                <li>Copyright © 1991-2018 Unicode, Inc. All rights reserved.</li>
+                <li>Copyright © 1991-2019 Unicode, Inc. All rights reserved.</li>
                 <li>Certain documents and files on this website contain a legend
                 indicating that &quot;Modification is permitted.&quot; Any person is
                 hereby authorized, without fee, to modify such documents and
@@ -250,7 +250,8 @@ <h3 align="center"><a name="Exhibit1">EXHIBIT 1</a><br>
 <pre>
 Unicode Data Files include all data files under the directories
 http://www.unicode.org/Public/, http://www.unicode.org/reports/,
-http://www.unicode.org/cldr/data/, http://source.icu-project.org/repos/icu/, and
+http://www.unicode.org/cldr/data/, http://source.icu-project.org/repos/icu/,
+http://www.unicode.org/ivd/data/, and
 http://www.unicode.org/utility/trac/browser/.
 
 Unicode Data Files do not include PDF online code charts under the
@@ -272,7 +273,7 @@ <h3 align="center"><a name="Exhibit1">EXHIBIT 1</a><br>
 
 COPYRIGHT AND PERMISSION NOTICE
 
-Copyright © 1991-2018 Unicode, Inc. All rights reserved.
+Copyright © 1991-2019 Unicode, Inc. All rights reserved.
 Distributed under the Terms of Use in http://www.unicode.org/copyright.html.
 
 Permission is hereby granted, free of charge, to any person obtaining

commit 08840f2f7bfc6144bd163dd85efe87d28541e425
Author: Michael Albinus <michael.albinus@gmx.de>
Date:   Fri Jan 26 11:57:41 2018 +0100

    Handle quoted file names in filenotify.el
    
    * lisp/filenotify.el (file-notify-add-watch): Do not save
    quoted file names in `file-notify-descriptors'.
    
    * test/lisp/files-tests.el
    (files-file-name-non-special-notify-handlers): Do not expect
    to fail.

diff --git a/lisp/filenotify.el b/lisp/filenotify.el
index 08a6f6efb6..101ddb6be0 100644
--- a/lisp/filenotify.el
+++ b/lisp/filenotify.el
@@ -307,7 +307,10 @@ FILE is the name of the file whose event is being reported."
   (unless (functionp callback)
     (signal 'wrong-type-argument `(,callback)))
 
-  (let* ((handler (find-file-name-handler file 'file-notify-add-watch))
+  (let* ((quoted (file-name-quoted-p file))
+         (file (file-name-unquote file))
+         (file-name-handler-alist (if quoted nil file-name-handler-alist))
+         (handler (find-file-name-handler file 'file-notify-add-watch))
 	 (dir (directory-file-name
 	       (if (file-directory-p file)
 		   file

commit e0870c38016b2e824768fe692ba3c21bb9aec341
Author: Glenn Morris <rgm@gnu.org>
Date:   Tue Jan 1 06:25:23 2019 -0500

    ; Auto-commit of loaddefs files.

diff --git a/lisp/ldefs-boot.el b/lisp/ldefs-boot.el
index 945bc95439..7b7f93c3b0 100644
--- a/lisp/ldefs-boot.el
+++ b/lisp/ldefs-boot.el
@@ -6022,7 +6022,10 @@ Activates the region if needed.  Only lasts until the region is deactivated.
 ;;;;;;  (0 0 0 0))
 ;;; Generated autoloads from emacs-lisp/cursor-sensor.el
 
-(defvar cursor-sensor-inhibit nil)
+(defvar cursor-sensor-inhibit nil "\
+When non-nil, suspend `cursor-sensor-mode' and `cursor-intangible-mode'.
+By convention, this is a list of symbols where each symbol stands for the
+\"cause\" of the suspension.")
 
 (autoload 'cursor-intangible-mode "cursor-sensor" "\
 Keep cursor outside of any `cursor-intangible' text property.