[Emacs-diffs] /srv/bzr/emacs/trunk r103829: lisp/font-lock.el: Remove obsolete code.

[Juanma Barranquero]

------------------------------------------------------------
revno: 103829
committer: Juanma Barranquero <address@hidden>
branch nick: trunk
timestamp: Tue 2011-04-05 17:20:21 +0200
message:
  lisp/font-lock.el: Remove obsolete code.
  
  * font-lock.el (font-lock-refresh-defaults):
    Don't bind `hi-lock--inhibit-font-lock-hook', removed in
    revno:99634.2.463 (2010-10-09) and revno:101913 (2010-10-12).
modified:
  lisp/ChangeLog
  lisp/font-lock.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-04-05 15:08:28 +0000
+++ b/lisp/ChangeLog    2011-04-05 15:20:21 +0000
@@ -1,5 +1,9 @@
 2011-04-05  Juanma Barranquero  <address@hidden>
 
+       * font-lock.el (font-lock-refresh-defaults):
+       Don't bind `hi-lock--inhibit-font-lock-hook', removed in
+       revno:99634.2.463 (2010-10-09) and revno:101913 (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  <address@hidden>

=== modified file 'lisp/font-lock.el'
--- a/lisp/font-lock.el 2011-03-08 04:28:14 +0000
+++ b/lisp/font-lock.el 2011-04-05 15:20:21 +0000
@@ -1765,8 +1765,7 @@
 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))