diff options
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/cedet/pulse.el | 3 | ||||
| -rw-r--r-- | lisp/jit-lock.el | 22 |
2 files changed, 17 insertions, 8 deletions
diff --git a/lisp/cedet/pulse.el b/lisp/cedet/pulse.el index 16243e16b45..8649254aedd 100644 --- a/lisp/cedet/pulse.el +++ b/lisp/cedet/pulse.el @@ -161,6 +161,9 @@ Return t if there is more drift to do, nil if completed." (face-background face nil t) (face-background 'pulse-highlight-start-face) )) + (and face + (set-face-extend 'pulse-highlight-face + (face-extend-p face nil t))) (put 'pulse-highlight-face :startface (or face 'pulse-highlight-start-face)) (put 'pulse-highlight-face :iteration 0)) diff --git a/lisp/jit-lock.el b/lisp/jit-lock.el index 9cdb108be03..c0c9cac23e7 100644 --- a/lisp/jit-lock.el +++ b/lisp/jit-lock.el @@ -96,16 +96,22 @@ See also `jit-lock-stealth-nice'." (defvaralias 'jit-lock-defer-contextually 'jit-lock-contextually) (defcustom jit-lock-contextually 'syntax-driven - "If non-nil, means fontification should be syntactically true. -If nil, means fontification occurs only on those lines modified. This + "If non-nil, fontification should be syntactically true. +If nil, refontification occurs only on lines that were modified. This means where modification on a line causes syntactic change on subsequent lines, those subsequent lines are not refontified to reflect their new context. -If t, means fontification occurs on those lines modified and all -subsequent lines. This means those subsequent lines are refontified to reflect -their new syntactic context, after `jit-lock-context-time' seconds. -If any other value, e.g., `syntax-driven', means syntactically true -fontification occurs only if syntactic fontification is performed using the -buffer mode's syntax table, i.e., only if `font-lock-keywords-only' is nil. +If t, fontification occurs on those lines modified and all subsequent lines. +This means those subsequent lines are refontified to reflect their new +syntactic context, after `jit-lock-context-time' seconds. +If any other value, e.g., `syntax-driven', it means refontification of +subsequent lines to reflect their new syntactic context may or may not +occur after `jit-lock-context-time', depending on the the font-lock +definitions of the buffer. Specifically, if `font-lock-keywords-only' +is nil in a buffer, which generally means the syntactic fontification +is done using the buffer mode's syntax table, the syntactic +refontification will be triggered (because in that case font-lock +calls `jit-lock-register' to set up for syntactic refontification, +and sets the buffer-local value of `jit-lock-contextually' to t). The value of this variable is used when JIT Lock mode is turned on." :type '(choice (const :tag "never" nil) |