From: Glenn Morris <rgm@gnu.org>
Date: Wed, 7 Apr 2021 14:50:17 +0000 (-0700)
Subject: Merge from origin/emacs-27
X-Git-Tag: emacs-28.0.90~2976
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=67628c9b2bc2b2f3e3fca2bf3e1e7357f38a2dd5;p=emacs.git

Merge from origin/emacs-27

2f5f30671a (origin/emacs-27) Fix broken links in autorevert.el
673c02f6d0 * lisp/international/ja-dic-cnv.el (skkdic-convert): Doc fix.
---

67628c9b2bc2b2f3e3fca2bf3e1e7357f38a2dd5
diff --cc lisp/international/ja-dic-cnv.el
index 3be7849df19,a5082f630c7..793508cae4a
--- a/lisp/international/ja-dic-cnv.el
+++ b/lisp/international/ja-dic-cnv.el
@@@ -323,13 -323,12 +323,11 @@@
      (insert ")\n\n")))
  
  (defun skkdic-convert (filename &optional dirname)
-   "Generate Emacs Lisp file form Japanese dictionary file FILENAME.
+   "Generate Emacs Lisp file from Japanese dictionary file FILENAME.
  The format of the dictionary file should be the same as SKK dictionaries.
- Optional argument DIRNAME if specified is the directory name under which
- the generated Emacs Lisp is saved.
- The name of generated file is specified by the variable `ja-dic-filename'."
+ Saves the output as `ja-dic-filename', in directory DIRNAME (if specified)."
    (interactive "FSKK dictionary file: ")
 -  (let* ((coding-system-for-read 'euc-japan)
 -	 (skkbuf (get-buffer-create " *skkdic-unannotated*"))
 +  (let* ((skkbuf (get-buffer-create " *skkdic-unannotated*"))
  	 (buf (get-buffer-create "*skkdic-work*")))
      ;; Set skkbuf to an unannotated copy of the dictionary.
      (with-current-buffer skkbuf