From 053d70660bcec9b66834e52c4860b32083da77a0 Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Fri, 2 Oct 2020 10:34:37 +0000 Subject: [PATCH] CC Mode: Convert the handling of c-special-indent-hook to standard usage * lisp/progmodes/cc-styles.el (c-set-style): Use kill-local-variable rather than copying the hook's global value to the local binding. (c-make-styles-buffer-local): Remove redundant make-variable-buffer-local. --- lisp/progmodes/cc-styles.el | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/lisp/progmodes/cc-styles.el b/lisp/progmodes/cc-styles.el index 36be9f6c74e..855e467571d 100644 --- a/lisp/progmodes/cc-styles.el +++ b/lisp/progmodes/cc-styles.el @@ -395,8 +395,7 @@ a null operation." ;; remain. This is not necessary for c-offsets-alist, since ;; c-get-style-variables contains every valid offset type in the ;; fallback entry. - (setq c-special-indent-hook - (default-value 'c-special-indent-hook))) + (kill-local-variable 'c-special-indent-hook)) (mapc (lambda (elem) (c-set-style-1 elem dont-override)) ;; Need to go through the variables backwards when we @@ -644,7 +643,7 @@ CC Mode by making sure the proper entries are present on (defun c-make-styles-buffer-local (&optional this-buf-only-p) "Make all CC Mode style variables buffer local. -If `this-buf-only-p' is non-nil, the style variables will be made +If THIS-BUF-ONLY-P is non-nil, the style variables will be made buffer local only in the current buffer. Otherwise they'll be made permanently buffer local in any buffer that changes their values. @@ -662,7 +661,6 @@ any reason to call this function directly." ;; Hooks must be handled specially (if this-buf-only-p (if (featurep 'xemacs) (make-local-hook 'c-special-indent-hook)) - (with-no-warnings (make-variable-buffer-local 'c-special-indent-hook)) (setq c-style-variables-are-local-p t)) )) -- 2.39.5