diff options
| author | Stefan Monnier | 2010-06-16 16:00:22 -0400 |
|---|---|---|
| committer | Stefan Monnier | 2010-06-16 16:00:22 -0400 |
| commit | 36901266a8acb83880fefee50c93abb09f64533b (patch) | |
| tree | 1f35549a951941504177432b0a5c9857f9924093 /lisp/ChangeLog | |
| parent | 8b9f5fe8d850c7724aabbfdbd26cb4afdf1d6440 (diff) | |
| download | emacs-36901266a8acb83880fefee50c93abb09f64533b.tar.gz emacs-36901266a8acb83880fefee50c93abb09f64533b.zip | |
* lisp/font-lock.el (font-lock-major-mode): Rename from
font-lock-mode-major-mode to distinguish it from
global-font-lock-mode's own font-lock-mode-major-mode.
(font-lock-set-defaults):
* lisp/font-core.el (font-lock-default-function): Adjust users.
(font-lock-mode): Don't set it at all.
Fixes: debbugs:6135
Diffstat (limited to 'lisp/ChangeLog')
| -rw-r--r-- | lisp/ChangeLog | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 6e8ba492710..5e24d87f085 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,12 @@ | |||
| 1 | 2010-06-16 Stefan Monnier <monnier@iro.umontreal.ca> | ||
| 2 | |||
| 3 | * font-lock.el (font-lock-major-mode): Rename from | ||
| 4 | font-lock-mode-major-mode to distinguish it from | ||
| 5 | global-font-lock-mode's own font-lock-mode-major-mode (bug#6135). | ||
| 6 | (font-lock-set-defaults): | ||
| 7 | * font-core.el (font-lock-default-function): Adjust users. | ||
| 8 | (font-lock-mode): Don't set it at all. | ||
| 9 | |||
| 1 | 2010-06-15 Stefan Monnier <monnier@iro.umontreal.ca> | 10 | 2010-06-15 Stefan Monnier <monnier@iro.umontreal.ca> |
| 2 | 11 | ||
| 3 | * vc-annotate.el (vc-annotate): Use vc-read-revision. | 12 | * vc-annotate.el (vc-annotate): Use vc-read-revision. |