From: Dan Nicolaescu <dann@ics.uci.edu>
Date: Mon, 31 Oct 2005 16:41:15 +0000 (+0000)
Subject: * loadup.el: Load emacs-lisp/syntax, font-lock and jit-lock so
X-Git-Tag: emacs-pretest-22.0.90~6164
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=c94f08ff7af4d0cebf29913bc2767abc25412c77;p=emacs.git

* 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.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 709fa5167a1..e91d94f3aee 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,16 @@
+2005-10-31  Dan Nicolaescu  <dann@ics.uci.edu>
+
+	* 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.
+
 2005-10-31  Nick Roberts  <nickrob@snap.net.nz>
 
 	* progmodes/gdb-ui.el (gdb-many-windows): Leave window configuration
diff --git a/lisp/emacs-lisp/syntax.el b/lisp/emacs-lisp/syntax.el
index 9c2ac336b9b..feccf7939c5 100644
--- a/lisp/emacs-lisp/syntax.el
+++ b/lisp/emacs-lisp/syntax.el
@@ -109,7 +109,6 @@ point (where the PPSS is equivalent to nil).")
 	      (error nil)))
 	  syntax-ppss-stats))
 
-;;;###autoload
 (defun syntax-ppss (&optional pos)
   "Parse-Partial-Sexp State at POS.
 The returned value is the same as `parse-partial-sexp' except that
diff --git a/lisp/font-lock.el b/lisp/font-lock.el
index 53a3a25f5d0..eb830b048e0 100644
--- a/lisp/font-lock.el
+++ b/lisp/font-lock.el
@@ -340,7 +340,6 @@ This can be an \"!\" or the \"n\" in \"ifndef\".")
 
 ;; Fontification variables:
 
-;;;###autoload
 (defvar font-lock-keywords nil
   "A list of the keywords to highlight.
 There are two kinds of values: user-level, and compiled.
@@ -630,7 +629,6 @@ Major/minor modes can set this variable if they know which option applies.")
   ;; Shut up the byte compiler.
   (defvar font-lock-face-attributes))	; Obsolete but respected if set.
 
-;;;###autoload
 (defun font-lock-mode-internal (arg)
   ;; Turn on Font Lock mode.
   (when arg
@@ -652,7 +650,6 @@ Major/minor modes can set this variable if they know which option applies.")
     (font-lock-unfontify-buffer)
     (font-lock-turn-off-thing-lock)))
 
-;;;###autoload
 (defun font-lock-add-keywords (mode keywords &optional append)
   "Add highlighting KEYWORDS for MODE.
 
@@ -771,7 +768,6 @@ see the variables `c-font-lock-extra-types', `c++-font-lock-extra-types',
 ;;      is added and removed several times.
 ;;
 ;; (II) The keywords are removed from the current buffer.
-;;;###autoload
 (defun font-lock-remove-keywords (mode keywords)
   "Remove highlighting KEYWORDS for MODE.
 
@@ -981,7 +977,6 @@ The value of this variable is used when Font Lock mode is turned on."
 ;; directives correctly and cleanly.  (It is the same problem as fontifying
 ;; multi-line strings and comments; regexps are not appropriate for the job.)
 
-;;;###autoload
 (defun font-lock-fontify-buffer ()
   "Fontify the current buffer the way the function `font-lock-mode' would."
   (interactive)
diff --git a/lisp/jit-lock.el b/lisp/jit-lock.el
index d3e3be12073..eb5ace956eb 100644
--- a/lisp/jit-lock.el
+++ b/lisp/jit-lock.el
@@ -264,7 +264,6 @@ the variable `jit-lock-stealth-nice'."
 	 (remove-hook 'after-change-functions 'jit-lock-after-change t)
 	 (remove-hook 'fontification-functions 'jit-lock-function))))
 
-;;;###autoload
 (defun jit-lock-register (fun &optional contextual)
   "Register FUN as a fontification function to be called in this buffer.
 FUN will be called with two arguments START and END indicating the region
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)
diff --git a/src/ChangeLog b/src/ChangeLog
index d5cdd48ad29..808b10cabe5 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2005-10-31  Dan Nicolaescu  <dann@ics.uci.edu>
+
+	* puresize.h (BASE_PURESIZE): Increment to 1170000.
+
 2005-10-31  Romain Francoise  <romain@orebokech.com>
 
 	* macfns.c: Update copyright year.
diff --git a/src/puresize.h b/src/puresize.h
index 8c755ea76a8..b9942a90753 100644
--- a/src/puresize.h
+++ b/src/puresize.h
@@ -42,7 +42,7 @@ Boston, MA 02110-1301, USA.  */
 #endif
 
 #ifndef BASE_PURESIZE
-#define BASE_PURESIZE (1130000 + SYSTEM_PURESIZE_EXTRA + SITELOAD_PURESIZE_EXTRA)
+#define BASE_PURESIZE (1170000 + SYSTEM_PURESIZE_EXTRA + SITELOAD_PURESIZE_EXTRA)
 #endif
 
 /* Increase BASE_PURESIZE by a ratio depending on the machine's word size.  */