Commit 30cac1e0 authored by Alan Mackenzie's avatar Alan Mackenzie
Browse files

Eliminate variable c-standard-font-lock-fontify-region-function.

        * progmodes/cc-mode.el
        (c-standard-font-lock-fontify-region-function): Remove.
        (c-font-lock-fontify-region, c-after-font-lock-init): Adapt.
parent 0922c475
2013-05-02 Alan Mackenzie <acm@muc.de>
Eliminate variable c-standard-font-lock-fontify-region-function.
* progmodes/cc-mode.el
(c-standard-font-lock-fontify-region-function): Remove.
(c-font-lock-fontify-region, c-after-font-lock-init): Adapt.
2013-05-01 Leo Liu <sdl.web@gmail.com> 2013-05-01 Leo Liu <sdl.web@gmail.com>
   
* progmodes/octave.el: Compatible with older emacs-24 releases. * progmodes/octave.el: Compatible with older emacs-24 releases.
......
...@@ -1160,9 +1160,6 @@ Note that the style variables are always made local to the buffer." ...@@ -1160,9 +1160,6 @@ Note that the style variables are always made local to the buffer."
;; `c-set-fl-decl-start' for the detailed functionality. ;; `c-set-fl-decl-start' for the detailed functionality.
(cons (c-set-fl-decl-start beg) end)) (cons (c-set-fl-decl-start beg) end))
(defvar c-standard-font-lock-fontify-region-function nil
"Standard value of `font-lock-fontify-region-function'")
(defun c-font-lock-fontify-region (beg end &optional verbose) (defun c-font-lock-fontify-region (beg end &optional verbose)
;; Effectively advice around `font-lock-fontify-region' which extends the ;; Effectively advice around `font-lock-fontify-region' which extends the
;; region (BEG END), for example, to avoid context fontification chopping ;; region (BEG END), for example, to avoid context fontification chopping
...@@ -1187,17 +1184,14 @@ Note that the style variables are always made local to the buffer." ...@@ -1187,17 +1184,14 @@ Note that the style variables are always made local to the buffer."
(setq new-region (funcall fn new-beg new-end)) (setq new-region (funcall fn new-beg new-end))
(setq new-beg (car new-region) new-end (cdr new-region))) (setq new-beg (car new-region) new-end (cdr new-region)))
c-before-context-fontification-functions)))) c-before-context-fontification-functions))))
(funcall c-standard-font-lock-fontify-region-function (funcall (default-value 'font-lock-fontify-region-function)
new-beg new-end verbose))) new-beg new-end verbose)))
(defun c-after-font-lock-init () (defun c-after-font-lock-init ()
;; Put on `font-lock-mode-hook'. This function ensures our after-change ;; Put on `font-lock-mode-hook'. This function ensures our after-change
;; function will get executed before the font-lock one. Amongst other ;; function will get executed before the font-lock one.
;; things.
(remove-hook 'after-change-functions 'c-after-change t) (remove-hook 'after-change-functions 'c-after-change t)
(add-hook 'after-change-functions 'c-after-change nil t) (add-hook 'after-change-functions 'c-after-change nil t))
(setq c-standard-font-lock-fontify-region-function
(default-value 'font-lock-fontify-region-function)))
(defun c-font-lock-init () (defun c-font-lock-init ()
"Set up the font-lock variables for using the font-lock support in CC Mode. "Set up the font-lock variables for using the font-lock support in CC Mode.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment