aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Monnier2023-08-03 23:43:12 -0400
committerStefan Monnier2023-08-03 23:43:12 -0400
commite9672b147f2e1f4879752f882fb58c7dc7ce3e9b (patch)
tree7c1834f55dba2464f6a6303696c63fa0befcad76
parent27ed565ec6163c499191b62a4cee10d99019aa38 (diff)
downloademacs-e9672b147f2e1f4879752f882fb58c7dc7ce3e9b.tar.gz
emacs-e9672b147f2e1f4879752f882fb58c7dc7ce3e9b.zip
* lisp/progmodes/cc-mode.el (c-advise-fl-for-region): Fix compiler warning
Make sure we macro-expand `defadvice` only when we want to use it.
-rw-r--r--lisp/progmodes/cc-mode.el24
1 files changed, 12 insertions, 12 deletions
diff --git a/lisp/progmodes/cc-mode.el b/lisp/progmodes/cc-mode.el
index dd699b9a119..a96863cd15e 100644
--- a/lisp/progmodes/cc-mode.el
+++ b/lisp/progmodes/cc-mode.el
@@ -2723,18 +2723,18 @@ This function is called from `c-common-init', once per mode initialization."
2723;; Emacs < 22 and XEmacs 2723;; Emacs < 22 and XEmacs
2724(defmacro c-advise-fl-for-region (function) 2724(defmacro c-advise-fl-for-region (function)
2725 (declare (debug t)) 2725 (declare (debug t))
2726 `(defadvice ,function (before get-awk-region activate) 2726 (unless (boundp 'font-lock-extend-after-change-region-function)
2727 ;; Make sure that any string/regexp is completely font-locked. 2727 `(defadvice ,function (before get-awk-region activate)
2728 (when c-buffer-is-cc-mode 2728 ;; Make sure that any string/regexp is completely font-locked.
2729 (save-excursion 2729 (when c-buffer-is-cc-mode
2730 (ad-set-arg 1 c-new-END) ; end 2730 (save-excursion
2731 (ad-set-arg 0 c-new-BEG))))) ; beg 2731 (ad-set-arg 1 c-new-END) ; end
2732 2732 (ad-set-arg 0 c-new-BEG)))))) ; beg
2733(unless (boundp 'font-lock-extend-after-change-region-function) 2733
2734 (c-advise-fl-for-region font-lock-after-change-function) 2734(c-advise-fl-for-region font-lock-after-change-function)
2735 (c-advise-fl-for-region jit-lock-after-change) 2735(c-advise-fl-for-region jit-lock-after-change)
2736 (c-advise-fl-for-region lazy-lock-defer-rest-after-change) 2736(c-advise-fl-for-region lazy-lock-defer-rest-after-change)
2737 (c-advise-fl-for-region lazy-lock-defer-line-after-change)) 2737(c-advise-fl-for-region lazy-lock-defer-line-after-change)
2738 2738
2739;; Connect up to `electric-indent-mode' (Emacs 24.4 and later). 2739;; Connect up to `electric-indent-mode' (Emacs 24.4 and later).
2740(defun c-electric-indent-mode-hook () 2740(defun c-electric-indent-mode-hook ()