Merge from origin/emacs-25

[gnu-emacs] / lisp / international / ja-dic-utl.el

diff --git a/lisp/international/ja-dic-utl.el b/lisp/international/ja-dic-utl.el
index 8e602ff177b1e10a2a92007d8780a795ede3595f..7005ba85726f1377b53b3f0b351f50cf220660ab 100644 (file)
--- a/lisp/international/ja-dic-utl.el
+++ b/lisp/international/ja-dic-utl.el
@@ -1,11 +1,11 @@
 ;;; ja-dic-utl.el --- utilities for handling Japanese dictionary (SKK-JISYO.L)
 
 ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006, 2007, 2008
+;;   2005, 2006, 2007, 2008, 2009, 2010, 2011
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
 ;;   Registration Number H14PRO021
 
-;; Keywords: mule, multilingual, Japanese
+;; Keywords: i18n, mule, multilingual, Japanese
 
 ;; This file is part of GNU Emacs.
 
@@ -109,13 +109,14 @@ without okurigana are placed at the head of the returned list."
          (load-library "ja-dic/ja-dic")
        (error (ding)
               (with-output-to-temp-buffer "*Help*"
-                (princ "The library `ja-dic' can't be loaded.
+                (princ (substitute-command-keys "\
+The library `ja-dic' can't be loaded.
 
 The most common case is that you have not yet installed the library
 included in LEIM (Libraries of Emacs Input Method) which is
 distributed separately from Emacs.
 
-LEIM is available from the same ftp directory as Emacs."))
+LEIM is available from the same ftp directory as Emacs.")))
               (signal (car err) (cdr err)))))
 
   (let ((vec (make-vector len 0))
@@ -222,5 +223,4 @@ LEIM is available from the same ftp directory as Emacs."))
 ;; coding: iso-2022-7bit
 ;; End:
 
-;; arch-tag: df2218fa-469c-40f6-bace-7f89a053f9c0
 ;;; ja-dic-utl.el ends here