From 165b0fa03d0f7652c247c671478070a5915881f2 Mon Sep 17 00:00:00 2001
From: "Richard M. Stallman" <rms@gnu.org>
Date: Fri, 28 Oct 2005 16:17:01 +0000
Subject: ("facemenu"): Load unconditionally. ("image",
 "international/fontset", "dnd", "mwheel", "tool-bar"): ("x-dnd"): Load, when
 appropriate.

---
 lisp/loadup.el | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

(limited to 'lisp/loadup.el')

diff --git a/lisp/loadup.el b/lisp/loadup.el
index 0d145486cdd..093f0ce4d13 100644
--- a/lisp/loadup.el
+++ b/lisp/loadup.el
@@ -133,9 +133,7 @@
 (load "term/tty-colors")
 (load "font-core")
 
-(if (fboundp 'frame-face-alist)
-    (progn
-      (load "facemenu")))
+(load "facemenu")
 (if (fboundp 'track-mouse)
     (progn
       (load "mouse")
@@ -164,6 +162,18 @@
       (load "vmsproc")))
 (load "abbrev")
 (load "buff-menu")
+
+(if (fboundp 'x-create-frame)
+    (progn
+      (load "image")
+      (load "international/fontset")
+      (load "dnd")
+      (load "mwheel")
+      (load "tool-bar")))
+(if (featurep 'x)
+    (load "x-dnd"))
+(message "%s" (garbage-collect))
+
 (if (eq system-type 'vax-vms)
     (progn
       (load "vms-patch")))
@@ -195,6 +205,7 @@
 (load "jka-cmpr-hook")
 (load "ediff-hook")
 (if (fboundp 'x-show-tip) (load "tooltip"))
+
 (message "%s" (garbage-collect))
 
 ;If you want additional libraries to be preloaded and their
-- 
cgit v1.2.1


From c94f08ff7af4d0cebf29913bc2767abc25412c77 Mon Sep 17 00:00:00 2001
From: Dan Nicolaescu <dann@ics.uci.edu>
Date: Mon, 31 Oct 2005 16:41:15 +0000
Subject: * loadup.el: Load emacs-lisp/syntax, font-lock and jit-lock so that
 global-font-lock-mode can be enabled by default.

* font-lock.el (font-lock-keywords, font-lock-mode-internal)
(font-lock-add-keywords, font-lock-remove-keywords)
(font-lock-fontify-buffer): Remove autoload cookies.

* jit-lock.el (jit-lock-register): Likewise.

* emacs-lisp/syntax.el (syntax-ppss): Likewise.

* puresize.h (BASE_PURESIZE): Increment to 1170000.
---
 lisp/loadup.el | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'lisp/loadup.el')

diff --git a/lisp/loadup.el b/lisp/loadup.el
index 093f0ce4d13..d821e411c67 100644
--- a/lisp/loadup.el
+++ b/lisp/loadup.el
@@ -132,6 +132,9 @@
 (load "frame")
 (load "term/tty-colors")
 (load "font-core")
+(load "emacs-lisp/syntax")
+(load "font-lock")
+(load "jit-lock")
 
 (load "facemenu")
 (if (fboundp 'track-mouse)
-- 
cgit v1.2.1


From 1f42385127ffec8471a2a2c74f11446e5119a1b6 Mon Sep 17 00:00:00 2001
From: Luc Teirlinck <teirllm@auburn.edu>
Date: Wed, 16 Nov 2005 02:26:37 +0000
Subject: Preload rfn-eshadow.

---
 lisp/loadup.el | 1 +
 1 file changed, 1 insertion(+)

(limited to 'lisp/loadup.el')

diff --git a/lisp/loadup.el b/lisp/loadup.el
index d821e411c67..dd0d04df754 100644
--- a/lisp/loadup.el
+++ b/lisp/loadup.el
@@ -145,6 +145,7 @@
       (load "select")))
 (load "emacs-lisp/timer")
 (load "isearch")
+(load "rfn-eshadow")
 
 (message "%s" (garbage-collect))
 (load "menu-bar")
-- 
cgit v1.2.1


From a4a198095f4ebe78fa639fe5ce953c7a3db24262 Mon Sep 17 00:00:00 2001
From: Luc Teirlinck <teirllm@auburn.edu>
Date: Mon, 28 Nov 2005 01:54:00 +0000
Subject: ("facemenu"): Load facemenu before font-lock, because
 `facemenu-keymap' needs to be defined when font-lock is loaded. Otherwise,
 `M-o M-o' is not bound to `font-lock-fontify-block'.

---
 lisp/loadup.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lisp/loadup.el')

diff --git a/lisp/loadup.el b/lisp/loadup.el
index dd0d04df754..3a8b8419003 100644
--- a/lisp/loadup.el
+++ b/lisp/loadup.el
@@ -132,11 +132,11 @@
 (load "frame")
 (load "term/tty-colors")
 (load "font-core")
+(load "facemenu")
 (load "emacs-lisp/syntax")
 (load "font-lock")
 (load "jit-lock")
 
-(load "facemenu")
 (if (fboundp 'track-mouse)
     (progn
       (load "mouse")
-- 
cgit v1.2.1


From 633537d7cd006f192fe72f2946b4b13f9dd6417e Mon Sep 17 00:00:00 2001
From: Luc Teirlinck <teirllm@auburn.edu>
Date: Tue, 29 Nov 2005 03:57:45 +0000
Subject: Add comment explaining why facemenu must be loaded before font-lock.

---
 lisp/loadup.el | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'lisp/loadup.el')

diff --git a/lisp/loadup.el b/lisp/loadup.el
index 3a8b8419003..fb6465c7884 100644
--- a/lisp/loadup.el
+++ b/lisp/loadup.el
@@ -132,6 +132,8 @@
 (load "frame")
 (load "term/tty-colors")
 (load "font-core")
+;; facemenu must be loaded before font-lock, because `facemenu-keymap'
+;; needs to be defined when font-lock is loaded.
 (load "facemenu")
 (load "emacs-lisp/syntax")
 (load "font-lock")
-- 
cgit v1.2.1