diff lisp/prim/loadup.el @ 124:9b50b4588a93 r20-1b15

Import from CVS: tag r20-1b15
author cvs
date Mon, 13 Aug 2007 09:26:39 +0200
parents cca96a509cfe
children 585fb297b004
line wrap: on
line diff
--- a/lisp/prim/loadup.el	Mon Aug 13 09:26:04 2007 +0200
+++ b/lisp/prim/loadup.el	Mon Aug 13 09:26:39 2007 +0200
@@ -38,6 +38,8 @@
     (error "loadup.el already loaded!"))
 
 (define-function 'defalias 'define-function)
+(defvar running-xemacs t
+  "non-nil when the current emacsen is XEmacs.")
 
 (call-with-condition-handler
       ;; This is awfully damn early to be getting an error, right?
@@ -78,6 +80,7 @@
      (load-gc "cl")
      (load-gc "widget")
      (load-gc "custom") ; Before the world so everything can be customized
+     (load-gc "cus-start") ; for customization of builtin variables
      (load-gc "cmdloop")
      (or (fboundp 'recursive-edit) (load-gc "cmdloop1"))
      (load-gc "keymap")