diff options
| author | Chong Yidong <cyd@stupidchicken.com> | 2008-09-05 22:08:37 +0000 |
|---|---|---|
| committer | Chong Yidong <cyd@stupidchicken.com> | 2008-09-05 22:08:37 +0000 |
| commit | 5e94230e84a18b68e1241c4c7f82f76f75300881 (patch) | |
| tree | 75b2e7cdda4ce26e15d2c35ff061e1aec2364e66 /lisp/international | |
| parent | 9effaf0a5ee8194ec89bbdbb0bb30424e262bdc3 (diff) | |
| download | emacs-5e94230e84a18b68e1241c4c7f82f76f75300881.tar.gz | |
Require help-mode.
(quail-help-init): Function removed.
(quail-keyboard-layout-button, quail-keyboard-customize-button):
Define directly.
Diffstat (limited to 'lisp/international')
| -rw-r--r-- | lisp/international/quail.el | 29 |
1 files changed, 13 insertions, 16 deletions
diff --git a/lisp/international/quail.el b/lisp/international/quail.el index 29a758e85de..e1bb93a1576 100644 --- 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 |