From 4103a5ce4ee207d9e8b4bf44887ce9afcca5a604 Mon Sep 17 00:00:00 2001 From: Morten Welinder Date: Mon, 17 Oct 1994 08:42:36 +0000 Subject: *** empty log message *** --- lisp/loadup.el | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'lisp/loadup.el') diff --git a/lisp/loadup.el b/lisp/loadup.el index 7b8f8922059..f9f0bd50093 100644 --- a/lisp/loadup.el +++ b/lisp/loadup.el @@ -100,12 +100,16 @@ (progn (load "ls-lisp") (garbage-collect) - (load "mouse") - (garbage-collect) (load "dos-fns") (garbage-collect) (load "disp-table") ; needed to setup ibm-pc char set, see internal.el - (garbage-collect))) + (garbage-collect) + (if (not (fboundp 'delete-frame)) + (progn + (load "mouse") + (garbage-collect) + (load "faces") + (garbage-collect))))) (if (fboundp 'atan) ; preload some constants and (progn ; floating pt. functions if (garbage-collect) ; we have float support. @@ -156,7 +160,8 @@ "-" (substring name (match-end 0))))) (if (eq system-type 'ms-dos) - (setq name (expand-file-name "../etc/DOC")) + (setq name (expand-file-name + (if (fboundp 'make-frame) "DOC-X" "DOC") "../etc")) (setq name (concat (expand-file-name "../etc/DOC-") name)) (if (file-exists-p name) (delete-file name)) -- cgit v1.2.1