diff options
| author | Dan Nicolaescu | 2005-10-31 16:41:15 +0000 |
|---|---|---|
| committer | Dan Nicolaescu | 2005-10-31 16:41:15 +0000 |
| commit | c94f08ff7af4d0cebf29913bc2767abc25412c77 (patch) | |
| tree | cc4e1cc4bc03952a91a9574d155353081b3878a7 | |
| parent | 2ad0fb7d013e9020a701c5c967b4e885fe0b8efc (diff) | |
| download | emacs-c94f08ff7af4d0cebf29913bc2767abc25412c77.tar.gz emacs-c94f08ff7af4d0cebf29913bc2767abc25412c77.zip | |
* 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.
| -rw-r--r-- | lisp/ChangeLog | 13 | ||||
| -rw-r--r-- | lisp/emacs-lisp/syntax.el | 1 | ||||
| -rw-r--r-- | lisp/font-lock.el | 5 | ||||
| -rw-r--r-- | lisp/jit-lock.el | 1 | ||||
| -rw-r--r-- | lisp/loadup.el | 3 | ||||
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/puresize.h | 2 |
7 files changed, 21 insertions, 8 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 709fa5167a1..e91d94f3aee 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,16 @@ | |||
| 1 | 2005-10-31 Dan Nicolaescu <dann@ics.uci.edu> | ||
| 2 | |||
| 3 | * loadup.el: Load emacs-lisp/syntax, font-lock and jit-lock so | ||
| 4 | that global-font-lock-mode can be enabled by default. | ||
| 5 | |||
| 6 | * font-lock.el (font-lock-keywords, font-lock-mode-internal) | ||
| 7 | (font-lock-add-keywords, font-lock-remove-keywords) | ||
| 8 | (font-lock-fontify-buffer): Remove autoload cookies. | ||
| 9 | |||
| 10 | * jit-lock.el (jit-lock-register): Likewise. | ||
| 11 | |||
| 12 | * emacs-lisp/syntax.el (syntax-ppss): Likewise. | ||
| 13 | |||
| 1 | 2005-10-31 Nick Roberts <nickrob@snap.net.nz> | 14 | 2005-10-31 Nick Roberts <nickrob@snap.net.nz> |
| 2 | 15 | ||
| 3 | * progmodes/gdb-ui.el (gdb-many-windows): Leave window configuration | 16 | * 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).") | |||
| 109 | (error nil))) | 109 | (error nil))) |
| 110 | syntax-ppss-stats)) | 110 | syntax-ppss-stats)) |
| 111 | 111 | ||
| 112 | ;;;###autoload | ||
| 113 | (defun syntax-ppss (&optional pos) | 112 | (defun syntax-ppss (&optional pos) |
| 114 | "Parse-Partial-Sexp State at POS. | 113 | "Parse-Partial-Sexp State at POS. |
| 115 | The returned value is the same as `parse-partial-sexp' except that | 114 | 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\".") | |||
| 340 | 340 | ||
| 341 | ;; Fontification variables: | 341 | ;; Fontification variables: |
| 342 | 342 | ||
| 343 | ;;;###autoload | ||
| 344 | (defvar font-lock-keywords nil | 343 | (defvar font-lock-keywords nil |
| 345 | "A list of the keywords to highlight. | 344 | "A list of the keywords to highlight. |
| 346 | There are two kinds of values: user-level, and compiled. | 345 | 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.") | |||
| 630 | ;; Shut up the byte compiler. | 629 | ;; Shut up the byte compiler. |
| 631 | (defvar font-lock-face-attributes)) ; Obsolete but respected if set. | 630 | (defvar font-lock-face-attributes)) ; Obsolete but respected if set. |
| 632 | 631 | ||
| 633 | ;;;###autoload | ||
| 634 | (defun font-lock-mode-internal (arg) | 632 | (defun font-lock-mode-internal (arg) |
| 635 | ;; Turn on Font Lock mode. | 633 | ;; Turn on Font Lock mode. |
| 636 | (when arg | 634 | (when arg |
| @@ -652,7 +650,6 @@ Major/minor modes can set this variable if they know which option applies.") | |||
| 652 | (font-lock-unfontify-buffer) | 650 | (font-lock-unfontify-buffer) |
| 653 | (font-lock-turn-off-thing-lock))) | 651 | (font-lock-turn-off-thing-lock))) |
| 654 | 652 | ||
| 655 | ;;;###autoload | ||
| 656 | (defun font-lock-add-keywords (mode keywords &optional append) | 653 | (defun font-lock-add-keywords (mode keywords &optional append) |
| 657 | "Add highlighting KEYWORDS for MODE. | 654 | "Add highlighting KEYWORDS for MODE. |
| 658 | 655 | ||
| @@ -771,7 +768,6 @@ see the variables `c-font-lock-extra-types', `c++-font-lock-extra-types', | |||
| 771 | ;; is added and removed several times. | 768 | ;; is added and removed several times. |
| 772 | ;; | 769 | ;; |
| 773 | ;; (II) The keywords are removed from the current buffer. | 770 | ;; (II) The keywords are removed from the current buffer. |
| 774 | ;;;###autoload | ||
| 775 | (defun font-lock-remove-keywords (mode keywords) | 771 | (defun font-lock-remove-keywords (mode keywords) |
| 776 | "Remove highlighting KEYWORDS for MODE. | 772 | "Remove highlighting KEYWORDS for MODE. |
| 777 | 773 | ||
| @@ -981,7 +977,6 @@ The value of this variable is used when Font Lock mode is turned on." | |||
| 981 | ;; directives correctly and cleanly. (It is the same problem as fontifying | 977 | ;; directives correctly and cleanly. (It is the same problem as fontifying |
| 982 | ;; multi-line strings and comments; regexps are not appropriate for the job.) | 978 | ;; multi-line strings and comments; regexps are not appropriate for the job.) |
| 983 | 979 | ||
| 984 | ;;;###autoload | ||
| 985 | (defun font-lock-fontify-buffer () | 980 | (defun font-lock-fontify-buffer () |
| 986 | "Fontify the current buffer the way the function `font-lock-mode' would." | 981 | "Fontify the current buffer the way the function `font-lock-mode' would." |
| 987 | (interactive) | 982 | (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'." | |||
| 264 | (remove-hook 'after-change-functions 'jit-lock-after-change t) | 264 | (remove-hook 'after-change-functions 'jit-lock-after-change t) |
| 265 | (remove-hook 'fontification-functions 'jit-lock-function)))) | 265 | (remove-hook 'fontification-functions 'jit-lock-function)))) |
| 266 | 266 | ||
| 267 | ;;;###autoload | ||
| 268 | (defun jit-lock-register (fun &optional contextual) | 267 | (defun jit-lock-register (fun &optional contextual) |
| 269 | "Register FUN as a fontification function to be called in this buffer. | 268 | "Register FUN as a fontification function to be called in this buffer. |
| 270 | FUN will be called with two arguments START and END indicating the region | 269 | 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 @@ | |||
| 132 | (load "frame") | 132 | (load "frame") |
| 133 | (load "term/tty-colors") | 133 | (load "term/tty-colors") |
| 134 | (load "font-core") | 134 | (load "font-core") |
| 135 | (load "emacs-lisp/syntax") | ||
| 136 | (load "font-lock") | ||
| 137 | (load "jit-lock") | ||
| 135 | 138 | ||
| 136 | (load "facemenu") | 139 | (load "facemenu") |
| 137 | (if (fboundp 'track-mouse) | 140 | (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 @@ | |||
| 1 | 2005-10-31 Dan Nicolaescu <dann@ics.uci.edu> | ||
| 2 | |||
| 3 | * puresize.h (BASE_PURESIZE): Increment to 1170000. | ||
| 4 | |||
| 1 | 2005-10-31 Romain Francoise <romain@orebokech.com> | 5 | 2005-10-31 Romain Francoise <romain@orebokech.com> |
| 2 | 6 | ||
| 3 | * macfns.c: Update copyright year. | 7 | * 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. */ | |||
| 42 | #endif | 42 | #endif |
| 43 | 43 | ||
| 44 | #ifndef BASE_PURESIZE | 44 | #ifndef BASE_PURESIZE |
| 45 | #define BASE_PURESIZE (1130000 + SYSTEM_PURESIZE_EXTRA + SITELOAD_PURESIZE_EXTRA) | 45 | #define BASE_PURESIZE (1170000 + SYSTEM_PURESIZE_EXTRA + SITELOAD_PURESIZE_EXTRA) |
| 46 | #endif | 46 | #endif |
| 47 | 47 | ||
| 48 | /* Increase BASE_PURESIZE by a ratio depending on the machine's word size. */ | 48 | /* Increase BASE_PURESIZE by a ratio depending on the machine's word size. */ |