HCoop
/
bpt
/
emacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge from trunk and resolve conflicts.
[bpt/emacs.git]
/
lisp
/
font-core.el
diff --git
a/lisp/font-core.el
b/lisp/font-core.el
index
f6701c0
..
17bfa29
100644
(file)
--- a/
lisp/font-core.el
+++ b/
lisp/font-core.el
@@
-1,6
+1,6
@@
;;; font-core.el --- Core interface to font-lock
;;; font-core.el --- Core interface to font-lock
-;; Copyright (C) 1992-201
2
Free Software Foundation, Inc.
+;; Copyright (C) 1992-201
3
Free Software Foundation, Inc.
;; Maintainer: FSF
;; Keywords: languages, faces
;; Maintainer: FSF
;; Keywords: languages, faces
@@
-138,6
+138,7
@@
The above is the default behavior of `font-lock-mode'; you may specify
your own function which is called when `font-lock-mode' is toggled via
`font-lock-function'. "
nil nil nil
your own function which is called when `font-lock-mode' is toggled via
`font-lock-function'. "
nil nil nil
+ :after-hook (font-lock-initial-fontify)
;; Don't turn on Font Lock mode if we don't have a display (we're running a
;; batch job) or if the buffer is invisible (the name starts with a space).
(when (or noninteractive (eq (aref (buffer-name) 0) ?\s))
;; Don't turn on Font Lock mode if we don't have a display (we're running a
;; batch job) or if the buffer is invisible (the name starts with a space).
(when (or noninteractive (eq (aref (buffer-name) 0) ?\s))
@@
-191,13
+192,7
@@
this function onto `change-major-mode-hook'."
;; Only do hard work if the mode has specified stuff in
;; `font-lock-defaults'.
;; Only do hard work if the mode has specified stuff in
;; `font-lock-defaults'.
- (when (or font-lock-defaults
- (if (boundp 'font-lock-keywords) font-lock-keywords)
- (and mode
- (boundp 'font-lock-set-defaults)
- font-lock-set-defaults
- font-lock-major-mode
- (not (eq font-lock-major-mode major-mode))))
+ (when (font-lock-specified-p mode)
(font-lock-mode-internal mode)))
(defun turn-on-font-lock ()
(font-lock-mode-internal mode)))
(defun turn-on-font-lock ()