changeset 98006:bb607b812d23

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

--- a/lisp/international/quail.el	Fri Sep 05 22:08:26 2008 +0000
+++ b/lisp/international/quail.el	Fri Sep 05 22:08:37 2008 +0000
@@ -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 @@
 	(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-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-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