diff options
| -rw-r--r-- | lisp/ChangeLog | 6 | ||||
| -rw-r--r-- | lisp/font-lock.el | 3 |
2 files changed, 6 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 022fc933741..76a9923e7a0 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,9 @@ 2011-04-05 Juanma Barranquero <lekktu@gmail.com> + * font-lock.el (font-lock-refresh-defaults): + Don't bind `hi-lock--inhibit-font-lock-hook', removed in + 2010-10-09T04:09:19Z!cyd@stupidchicken.com and 2010-10-11T23:57:49Z!lekktu@gmail.com (2010-10-12). + * info.el (Info-directory-list, Info-read-node-name-2) (Info-split-parameter-string): Doc fixes. (Info-virtual-nodes): Reflow docstring. @@ -15,7 +19,7 @@ (Info-history-find-file, Info-history-find-node, Info-toc-find-node) (Info-virtual-index-find-node, Info-apropos-find-file) (Info-apropos-find-node, Info-finder-find-file, Info-finder-find-node): - Mark unused parameters; fix typos in arguments. + Mark unused parameters; fix typos in docstrings. (Info-virtual-index): Remove unused local variable `nodename'. 2011-04-05 Deniz Dogan <deniz@dogan.se> diff --git a/lisp/font-lock.el b/lisp/font-lock.el index 988e821d7e2..32fbb0608a2 100644 --- a/lisp/font-lock.el +++ b/lisp/font-lock.el @@ -1765,8 +1765,7 @@ variables directly. Note: This function will erase modifications done by `font-lock-add-keywords' or `font-lock-remove-keywords', but will preserve `hi-lock-mode' highlighting patterns." - (let ((hi-lock--inhibit-font-lock-hook t)) - (font-lock-mode -1)) + (font-lock-mode -1) (kill-local-variable 'font-lock-set-defaults) (font-lock-mode 1)) |