master e5bf2b942f 3/3: Improve message regarding missing LEIM

[Stefan Kangas]

branch: master
commit e5bf2b942fec6e901c165aff93c89e4dd8e448dd
Author: Stefan Kangas <stefan@marxist.se>
Commit: Stefan Kangas <stefan@marxist.se>

    Improve message regarding missing LEIM
    
    * lisp/international/ja-dic-utl.el (skkdic-lookup-key):
    * lisp/international/mule-diag.el (list-input-methods-1):
    * lisp/international/quail.el (quail-use-package): Explain that LEIM
    is installed together with Emacs.
---
 lisp/international/ja-dic-utl.el | 8 +++-----
 lisp/international/mule-diag.el  | 7 +++++--
 lisp/international/quail.el      | 8 +++-----
 3 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/lisp/international/ja-dic-utl.el b/lisp/international/ja-dic-utl.el
index cc636986f9..3f6500669a 100644
--- a/lisp/international/ja-dic-utl.el
+++ b/lisp/international/ja-dic-utl.el
@@ -112,11 +112,9 @@ without okurigana are placed at the head of the returned 
list."
                 (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.")))
+This might indicate a problem with your Emacs installation, as
+LEIM (Libraries of Emacs Input Method) should normally always be
+installed together with Emacs.")))
               (signal (car err) (cdr err)))))
 
   (let ((vec (make-vector len 0))
diff --git a/lisp/international/mule-diag.el b/lisp/international/mule-diag.el
index 646e0b8480..cdf2e527e2 100644
--- a/lisp/international/mule-diag.el
+++ b/lisp/international/mule-diag.el
@@ -1068,8 +1068,11 @@ see the function `describe-fontset' for the format of 
the list."
   (with-current-buffer standard-output
     (if (not input-method-alist)
         (insert "
-No input method is available, perhaps because you have not
-installed LEIM (Libraries of Emacs Input Methods).")
+No input method is available.
+
+This might indicate a problem with your Emacs installation, as
+LEIM (Libraries of Emacs Input Method) should normally always be
+installed together with Emacs.")
       (insert (substitute-command-keys
                "LANGUAGE\n  NAME (`TITLE' in mode line)\n"))
       (insert "    SHORT-DESCRIPTION\n------------------------------\n")
diff --git a/lisp/international/quail.el b/lisp/international/quail.el
index 529cf97215..4bb6dbcc8e 100644
--- a/lisp/international/quail.el
+++ b/lisp/international/quail.el
@@ -249,11 +249,9 @@ This activates input method defined by PACKAGE-NAME by 
running
                  (princ (car libraries))
                  (princ (substitute-command-keys "\" is not in `load-path'.
 
-The most common case is that you have not yet installed appropriate
-libraries in LEIM (Libraries of Emacs Input Method) which is
-distributed separately from Emacs.
-
-LEIM is available from the same ftp directory as Emacs.")))
+This might indicate a problem with your Emacs installation, as
+LEIM (Libraries of Emacs Input Method) should normally always be
+installed together with Emacs.")))
                (error "Can't use the Quail package `%s'" package-name))
            (setq libraries (cdr libraries))))))
   (quail-select-package package-name)