; Minor copyedits of --with-small-ja-dic option

* etc/NEWS: Document the new configuration option.

* lisp/international/ja-dic-cnv.el (skkdic-convert-okuri-nasi):
Fix whitespace.
(skkdic-convert): Doc fix.
(batch-skkdic-convert): Fix Help message.

* configure.ac: Tweak the description of --with-small-ja-dic.

diff --git a/configure.ac b/configure.ac
index 3e6eab94f8ff1169f90fd677a2282a128c49db12..5b86e9092558d0de815895872c1ddacc8d41b601 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -491,7 +491,7 @@ OPTION_DEFAULT_ON([threads],[don't compile with elisp threading support])
 OPTION_DEFAULT_OFF([native-compilation],[compile with Emacs Lisp native compiler support])
 OPTION_DEFAULT_OFF([cygwin32-native-compilation],[use native compilation on 32-bit Cygwin])
 OPTION_DEFAULT_ON([xinput2],[don't use version 2 of the X Input Extension for input])
-OPTION_DEFAULT_OFF([small-ja-dic],[generate a small-sized Japanese dictionary])
+OPTION_DEFAULT_OFF([small-ja-dic],[generate a smaller-size Japanese dictionary])
 
 AC_ARG_WITH([file-notification],[AS_HELP_STRING([--with-file-notification=LIB],
  [use a file notification library (LIB one of: yes, inotify, kqueue, gfile, w32, no)])],
@@ -6493,7 +6493,7 @@ AS_ECHO(["  Does Emacs use -lXaw3d?                                 ${HAVE_XAW3D
   Which dumping strategy does Emacs use?                  ${with_dumping}
   Does Emacs have native lisp compiler?                   ${HAVE_NATIVE_COMP}
   Does Emacs use version 2 of the the X Input Extension?  ${HAVE_XINPUT2}
-  Should Emacs use a small-sized Japanese dictionary?     ${with_small_ja_dic}
+  Does Emacs generate a smaller-size Japanese dictionary? ${with_small_ja_dic}
 "])
 
 if test -n "${EMACSDATA}"; then

diff --git a/etc/NEWS b/etc/NEWS
index 88758abc64e856eb29f58f9b83c06a5449d6f1f8..2716fde135ba1b9202f45d1d3e07eeec2ada668a 100644 (file)
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -68,6 +68,21 @@ option '--without-xinput2' to disable this support.
 '(featurep 'xinput2)' can be used to test for the presence of XInput 2
 support from Lisp programs.
 
+---
+** Emacs now doesn't reduce the size of the Japanese dictionary.
+Building Emacs includes generation of a Japanese dictionary, which is
+used by Japanese input methods.  Previously, the build included a step
+of reducing the size of this dictionary's vocabulary.  This vocabulary
+reduction is now optional, by default off.  If you need the Emacs
+build to include the vocabulary reduction, configure Emacs with the
+option '--with-small-ja-dic'.  In an Emacs source tree already
+configured without that option, you can force the vocabulary reduction
+by saying
+
+    make -C leim generate-ja-dic JA_DIC_NO_REDUCTION_OPTION=''
+
+after deleting lisp/leim/ja-dic/ja-dic.el.
+
 +++
 ** Emacs now supports being built with pure GTK.
 To use this option, make sure the GTK 3 (version 3.20 or later) and

diff --git a/lisp/international/ja-dic-cnv.el b/lisp/international/ja-dic-cnv.el
index 0bad7dea0a01aa33ddcf48969a6bc4ffbabd658d..ec68d8c80466cd95e8318cd6fa8c601cc17e4634 100644 (file)
--- a/lisp/international/ja-dic-cnv.el
+++ b/lisp/international/ja-dic-cnv.el
@@ -315,7 +315,7 @@
          (if (setq candidates
                     (if no-reduction
                         candidates
-                        (skkdic-reduced-candidates skkbuf kana candidates)))
+                      (skkdic-reduced-candidates skkbuf kana candidates)))
              (progn
                (insert "\"" kana)
                (while candidates
@@ -330,8 +330,7 @@
   "Generate Emacs Lisp file from Japanese dictionary file FILENAME.
 The format of the dictionary file should be the same as SKK dictionaries.
 Saves the output as `ja-dic-filename', in directory DIRNAME (if specified).
-When NO-REDUCTION is t, then not reduce dictionary vocabulary.
-"
+If NO-REDUCTION is non-nil, do not reduce the dictionary vocabulary."
   (interactive "FSKK dictionary file: ")
   (let* ((skkbuf (get-buffer-create " *skkdic-unannotated*"))
         (buf (get-buffer-create "*skkdic-work*")))
@@ -425,7 +424,7 @@ To get complete usage, invoke:
        (message "  %% emacs -batch -l ja-dic-cnv -f batch-skkdic-convert SKK-JISYO.L")
        (message "To convert SKK-JISYO.L into DIR/ja-dic.el:")
        (message "  %% emacs -batch -l ja-dic-cnv -f batch-skkdic-convert -dir DIR SKK-JISYO.L")
-        (message "To convert SKK-JISYO.L into skkdic.el with not reduce dictionary vocabulary:")
+        (message "To convert SKK-JISYO.L into skkdic.el without reducing dictionary vocabulary:")
         (message "  %% emacs -batch -l ja-dic-cnv -f batch-skkdic-convert --no-reduction SKK-JISYO.L"))
     (let (targetdir filename no-reduction)
       (if (string= (car command-line-args-left) "-dir")