The C and Lisp conditions for loading tooltip in the patches below are
not completely equivalent, but I believe I understood that this does
not matter too much. I saw everything else that was conditionally
loaded use a FOO_SUPPORT macro, so I defined a TOOLTIP_SUPPORT macro.
I can only test this on GNU/Linux.
===File ~/src-Makefile.in-diff==============================
*** Makefile.in 19 Mar 2005 13:29:50 -0600 1.307
--- Makefile.in 13 Apr 2005 20:37:51 -0500
***************
*** 686,691 ****
--- 686,697 ----
#define WINNT_SUPPORT
#endif
+ #if defined (HAVE_WINDOW_SYSTEM) && !defined (MSDOS)
+ #define TOOLTIP_SUPPORT ${lispsource}tooltip.elc
+ #else
+ #define TOOLTIP_SUPPORT
+ #endif
+
/* List of Lisp files loaded into the dumped Emacs. It's arranged
like this because it's easier to generate it semi-mechanically from
loadup.el this way.
***************
*** 779,784 ****
--- 785,791 ----
${lispsource}emacs-lisp/timer.elc \
${lispsource}vc-hooks.elc \
${lispsource}ediff-hook.elc \
+ TOOLTIP_SUPPORT \
VMS_SUPPORT \
MSDOS_SUPPORT \
WINNT_SUPPORT \
***************
*** 885,890 ****
--- 892,898 ----
${dotdot}/lisp/ls-lisp.elc ${dotdot}/lisp/dos-fns.elc \
${dotdot}/lisp/w32-fns.elc ${dotdot}/lisp/dos-w32.elc \
${dotdot}/lisp/disp-table.elc ${dotdot}/lisp/dos-vars.elc \
+ ${dotdot}/lisp/tooltip.elc \
${dotdot}/lisp/international/ccl.elc \
${dotdot}/lisp/international/codepage.elc
============================================================
===File ~/loadup-diff=======================================
*** loadup.el 19 Mar 2005 13:28:44 -0600 1.135
--- loadup.el 13 Apr 2005 20:15:24 -0500
***************
*** 192,197 ****
--- 192,200 ----
(load "vc-hooks")
(load "ediff-hook")
+ (and (display-graphic-p)
+ (fboundp 'x-show-tip)
+ (load "tooltip"))
(message "%s" (garbage-collect))
;If you want additional libraries to be preloaded and their
============================================================
===File ~/startup-diff======================================
*** startup.el 13 Apr 2005 17:18:03 -0500 1.350
--- startup.el 13 Apr 2005 20:17:53 -0500
***************
*** 746,751 ****
--- 746,754 ----
(custom-reevaluate-setting 'blink-cursor-mode)
(custom-reevaluate-setting 'normal-erase-is-backspace)
+ ;; If you change the code below, you need to also change the
+ ;; corresponding code in the tooltip-mode defcustom. The two need
+ ;; to be equivalent under all conditions, or Custom will get confused.
(unless (or noninteractive
emacs-basic-display
(not (display-graphic-p))
============================================================
===File ~/tooltip-diff======================================
*** tooltip.el 31 Mar 2005 08:49:03 -0600 1.46
--- tooltip.el 10 Apr 2005 07:27:01 -0500
***************
*** 187,192 ****
--- 187,198 ----
"Toggle Tooltip display.
With ARG, turn tooltip mode on if and only if ARG is positive."
:global t
+ ;; If you change the :init-value below, you also need to change the
+ ;; corresponding code in startup.el.
+ :init-value (not (or noninteractive
+ emacs-quick-startup
+ (not (display-graphic-p))
+ (not (fboundp 'x-show-tip))))
:group 'tooltip
(unless (or (null tooltip-mode) (fboundp 'x-show-tip))
(error "Sorry, tooltips are not yet available on this system"))
============================================================
_______________________________________________
Emacs-devel mailing list
Emacs-devel@gnu.org
http://lists.gnu.org/mailman/listinfo/emacs-devel
