aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Monnier2006-09-28 20:03:25 +0000
committerStefan Monnier2006-09-28 20:03:25 +0000
commit472e1031aea8faf04162b8bfef529ba384328af9 (patch)
treeedf07ecf2e9b18bfd93c688a10eac3e414e103ca
parentefa0c0ef0b0a50bcda2791b33c7b089d3a9ce95b (diff)
downloademacs-472e1031aea8faf04162b8bfef529ba384328af9.tar.gz
emacs-472e1031aea8faf04162b8bfef529ba384328af9.zip
(makefile-mode): Don't disable jit-lock.
-rw-r--r--lisp/ChangeLog2
-rw-r--r--lisp/progmodes/make-mode.el4
2 files changed, 4 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0d541307949..e637915d3b0 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
12006-09-28 Stefan Monnier <monnier@iro.umontreal.ca> 12006-09-28 Stefan Monnier <monnier@iro.umontreal.ca>
2 2
3 * progmodes/make-mode.el (makefile-mode): Don't disable jit-lock.
4
3 * font-lock.el (font-lock-after-change-function): Refontify next line 5 * font-lock.el (font-lock-after-change-function): Refontify next line
4 as well if end is at BOL. 6 as well if end is at BOL.
5 (font-lock-extend-jit-lock-region-after-change): Be more careful to 7 (font-lock-extend-jit-lock-region-after-change): Be more careful to
diff --git a/lisp/progmodes/make-mode.el b/lisp/progmodes/make-mode.el
index 109455e9e61..c7341a9f871 100644
--- a/lisp/progmodes/make-mode.el
+++ b/lisp/progmodes/make-mode.el
@@ -836,8 +836,8 @@ Makefile mode can be configured by modifying the following variables:
836 nil nil 836 nil nil
837 ((?$ . ".")) 837 ((?$ . "."))
838 backward-paragraph 838 backward-paragraph
839 (font-lock-syntactic-keywords . makefile-font-lock-syntactic-keywords) 839 (font-lock-syntactic-keywords
840 (font-lock-support-mode))) ; JIT breaks on long series of continuation lines. 840 . makefile-font-lock-syntactic-keywords)))
841 841
842 ;; Add-log. 842 ;; Add-log.
843 (make-local-variable 'add-log-current-defun-function) 843 (make-local-variable 'add-log-current-defun-function)