[Emacs-diffs] Changes to emacs/lisp/international/quail.el,v

[Kenichi Handa]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Kenichi Handa <handa>   07/08/06 01:01:21

Index: quail.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/international/quail.el,v
retrieving revision 1.156
retrieving revision 1.157
diff -u -b -r1.156 -r1.157
--- quail.el    26 Jul 2007 05:27:08 -0000      1.156
+++ quail.el    6 Aug 2007 01:01:20 -0000       1.157
@@ -55,7 +55,7 @@
 
 ;;; Code:
 
-(require 'help-mode)
+(eval-when-compile (require 'help-mode))
 
 (defgroup quail nil
   "Quail: multilingual input method."
@@ -2431,22 +2431,27 @@
        (insert ?\n))
       (insert ?\n))))
 
-(define-button-type 'quail-keyboard-layout-button
+(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)
+                       (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
+    (define-button-type 'quail-keyboard-customize-button
   :supertype 'help-customize-variable
-  'help-echo (purecopy "mouse-2, RET: customize keyboard layout"))
+      '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)
   (let ((help-xref-mule-regexp help-xref-mule-regexp-template)
        (default-enable-multibyte-characters enable-multibyte-characters)
        (package-def
@@ -2629,7 +2634,7 @@
 ;; it is not yet stored.  As a result, the element is a string or a
 ;; list of strings.
 
-(defsubst quail-store-decode-map-key (table char key)
+(defun quail-store-decode-map-key (table char key)
   (let ((elt (aref table char)))
     (if elt
        (if (consp elt)