diff options
| -rw-r--r-- | lisp/ChangeLog | 1 | ||||
| -rw-r--r-- | lisp/font-core.el | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index cbebfb06a15..8b4b81af35d 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -7,6 +7,7 @@ | |||
| 7 | 7 | ||
| 8 | * font-core.el (global-font-lock-mode): Use define-global-minor-mode | 8 | * font-core.el (global-font-lock-mode): Use define-global-minor-mode |
| 9 | instead of easy-mmode-define-global-mode. Add `:group font-lock'. | 9 | instead of easy-mmode-define-global-mode. Add `:group font-lock'. |
| 10 | (font-lock-mode): Replace `:group font-lock' with `nil nil nil'. | ||
| 10 | 11 | ||
| 11 | * font-lock.el (lisp-font-lock-keywords-1): | 12 | * font-lock.el (lisp-font-lock-keywords-1): |
| 12 | Add define-global-minor-mode. | 13 | Add define-global-minor-mode. |
diff --git a/lisp/font-core.el b/lisp/font-core.el index 68596832270..cfddbca5f5c 100644 --- a/lisp/font-core.el +++ b/lisp/font-core.el | |||
| @@ -146,7 +146,7 @@ buffer local value for `font-lock-defaults', via its mode hook. | |||
| 146 | The above is the default behavior of `font-lock-mode'; you may specify | 146 | The above is the default behavior of `font-lock-mode'; you may specify |
| 147 | your own function which is called when `font-lock-mode' is toggled via | 147 | your own function which is called when `font-lock-mode' is toggled via |
| 148 | `font-lock-function'. " | 148 | `font-lock-function'. " |
| 149 | :group 'font-lock | 149 | nil nil nil |
| 150 | ;; Don't turn on Font Lock mode if we don't have a display (we're running a | 150 | ;; Don't turn on Font Lock mode if we don't have a display (we're running a |
| 151 | ;; batch job) or if the buffer is invisible (the name starts with a space). | 151 | ;; batch job) or if the buffer is invisible (the name starts with a space). |
| 152 | (when (or noninteractive (eq (aref (buffer-name) 0) ?\ )) | 152 | (when (or noninteractive (eq (aref (buffer-name) 0) ?\ )) |