Require help-mode.

(quail-help-init): Function removed.
(quail-keyboard-layout-button, quail-keyboard-customize-button):
Define directly.

diff --git a/lisp/international/quail.el b/lisp/international/quail.el
index 29a758e85de020499cb7321068c60f1bf5128501..e1bb93a15768f410cf111183809066788ed9d608 100644 (file)
--- a/lisp/international/quail.el
+++ b/lisp/international/quail.el
@@ -53,7 +53,7 @@
 
 ;;; Code:
 
-(eval-when-compile (require 'help-mode))
+(require 'help-mode)
 
 (defgroup quail nil
   "Quail: multilingual input method."
@@ -2424,27 +2424,24 @@ should be made by `quail-build-decode-map' (which see)."
        (insert ?\n))
       (insert ?\n))))
 
-(defun quail-help-init ()
-  (unless (featurep 'help-mode)
-    (require 'help-mode)
-    (define-button-type 'quail-keyboard-layout-button
-      :supertype 'help-xref
-      'help-function '(lambda (layout)
-                       (help-setup-xref `(quail-keyboard-layout-button ,layout)
-                                        nil)
-                       (quail-show-keyboard-layout layout))
-      'help-echo (purecopy "mouse-2, RET: show keyboard layout"))
-
-    (define-button-type 'quail-keyboard-customize-button
-      :supertype 'help-customize-variable
-      'help-echo (purecopy "mouse-2, RET: customize keyboard layout"))))
+(define-button-type 'quail-keyboard-layout-button
+  :supertype 'help-xref
+  'help-function '(lambda (layout)
+                   (help-setup-xref `(quail-keyboard-layout-button ,layout)
+                                    nil)
+                   (quail-show-keyboard-layout layout))
+  'help-echo (purecopy "mouse-2, RET: show keyboard layout"))
+
+(define-button-type 'quail-keyboard-customize-button
+  :supertype 'help-customize-variable
+  'help-echo (purecopy "mouse-2, RET: customize keyboard layout"))
 
 (defun quail-help (&optional package)
   "Show brief description of the current Quail package.
 Optional arg PACKAGE specifies the name of alternative Quail
 package to describe."
   (interactive)
-  (quail-help-init)
+  (require 'help-mode)
   (let ((help-xref-mule-regexp help-xref-mule-regexp-template)
        (mb enable-multibyte-characters)
        (package-def