From da87aef27deadb4ebbf94cff32faf8c990f27c0b Mon Sep 17 00:00:00 2001 From: shuhei-k Date: Sun, 16 May 1999 06:30:30 +0000 Subject: [PATCH] Added localhook. Compilation order of tinycustom and pcustom was changed. --- EMU-ELS | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/EMU-ELS b/EMU-ELS index dd01515..1ffde2d 100644 --- a/EMU-ELS +++ b/EMU-ELS @@ -8,15 +8,14 @@ (if (or running-emacs-19_29-or-later running-xemacs-19_14-or-later) '(richtext) - '(tinyrich) - ))) + '(tinyrich)))) -(setq pcustom-modules - (cons 'pcustom - (if (module-installed-p 'custom) - nil - '(tinycustom) - ))) +(setq pcustom-modules (if (and (module-installed-p 'custom) + ;; new custom requires widget. + (module-installed-p 'widget)) + '(pcustom) + ;; XXX: order is significant in current make process. + '(tinycustom pcustom))) (let ((poe-modules '(poe)) (poem-modules '(poem)) @@ -34,6 +33,8 @@ (setq poe-modules (cons 'poe-18 poe-modules) invisible-modules (cons 'inv-18 invisible-modules)) )) + (or running-emacs-19_29-or-later + (setq poe-modules (cons 'localhook poe-modules))) (cond ((featurep 'mule) (cond ((featurep 'xemacs) (setq poem-modules (cons 'poem-xm (cons 'poem-20 @@ -77,13 +78,14 @@ (setq poem-modules (cons 'poem-ltn1 poem-modules) mcs-modules (cons 'mcs-ltn1 mcs-modules)) )) - + (setq emu-modules (append poe-modules poem-modules mcs-modules invisible-modules pccl-modules pcustom-modules emu-modules)) + (setq emu-modules (cons 'broken emu-modules)) (setq emu-modules (cons 'static emu-modules)) - ) + ) ;;; EMU-ELS ends here -- 1.7.10.4