Provide skkdic-cnv.

(skkdic-convert): Emit code to require skkdic-cnv at compile time.
(batch-skkdic-convert): Doc fix.

1 files changed, 6 insertions, 5 deletions

diff --git a/lisp/international/skkdic-cnv.el b/lisp/international/skkdic-cnv.el
index 06f8421478b..186cc8bfb48 100644
--- a/lisp/international/skkdic-cnv.el
+++ b/lisp/international/skkdic-cnv.el
@@ -372,7 +372,7 @@ the generated \"skkdic.el\" is saved."
         (set-buffer buf)
         (insert-buffer-substring skkbuf 1 pos))
       (insert "\n"
-              ";;; Code:\n\n")
+              ";;; Code:\n\n(eval-when-compile (require 'skkdic-cnv))\n\n")
 
       ;; Generate the body part of working buffer.
       (set-buffer skkbuf)
@@ -425,10 +425,10 @@ the generated \"skkdic.el\" is saved."
 Use this from the command line, with `-batch';
 it won't work in an interactive Emacs.
 For example, invoke:
-  % emacs -batch -l skkconv -f batch-skkdic-convert SKK-JISYO.L
+  % emacs -batch -l skkdic-cnv -f batch-skkdic-convert SKK-JISYO.L
 to generate  \"skkdic.el\" from SKK dictionary file \"SKK-JISYO.L\".
 To get complete usage, invoke:
- % emacs -batch -l skkconv -f batch-skkdic-convert -h"
+ % emacs -batch -l skkdic-cnv -f batch-skkdic-convert -h"
   (defvar command-line-args-left)       ; Avoid compiler warning.
   (if (not noninteractive)
       (error "`batch-skkdic-convert' should be used only with -batch"))
@@ -449,8 +449,7 @@ To get complete usage, invoke:
       (message "It takes around 10 minutes even on Sun SS20.")
       (skkdic-convert filename targetdir)
       (message "Do byte-compile the created file by:")
-      (message "  %% emacs -batch -l skkdic-cnv -f batch-byte-compile skkdic.el")
-      (message  "                 ^^^^^^^^^^^^^ -- Don't forget this option!")
+      (message "  %% emacs -batch -f batch-byte-compile skkdic.el")
       ))
   (kill-emacs 0))
 
@@ -556,4 +555,6 @@ To get complete usage, invoke:
            (setq l (cdr l)))
          map)))
 
+(provide 'skkdic-cnv)
+
 ;; skkdic-cnv.el ends here