[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master dc0295c 4/7: Prefer setq-local in cfengine.el
From: |
Stefan Kangas |
Subject: |
master dc0295c 4/7: Prefer setq-local in cfengine.el |
Date: |
Wed, 9 Dec 2020 02:58:39 -0500 (EST) |
branch: master
commit dc0295c563069ffacfbe01b87baa7701887999c3
Author: Stefan Kangas <stefan@marxist.se>
Commit: Stefan Kangas <stefan@marxist.se>
Prefer setq-local in cfengine.el
* lisp/progmodes/cfengine.el (cfengine-common-settings)
(cfengine3-mode, cfengine2-mode): Prefer setq-local.
---
lisp/progmodes/cfengine.el | 46 ++++++++++++++++++++++------------------------
1 file changed, 22 insertions(+), 24 deletions(-)
diff --git a/lisp/progmodes/cfengine.el b/lisp/progmodes/cfengine.el
index a8fe485..6e91544 100644
--- a/lisp/progmodes/cfengine.el
+++ b/lisp/progmodes/cfengine.el
@@ -1314,19 +1314,19 @@ see. Use it by enabling `eldoc-mode'."
(append bounds (list (cdr flist))))))
(defun cfengine-common-settings ()
- (set (make-local-variable 'syntax-propertize-function)
- ;; In the main syntax-table, \ is marked as a punctuation, because
- ;; of its use in DOS-style directory separators. Here we try to
- ;; recognize the cases where \ is used as an escape inside strings.
- (syntax-propertize-rules ("\\(\\(?:\\\\\\)+\\)\"" (1 "\\"))))
- (set (make-local-variable 'parens-require-spaces) nil)
- (set (make-local-variable 'comment-start) "# ")
- (set (make-local-variable 'comment-start-skip)
- "\\(\\(?:^\\|[^\\\n]\\)\\(?:\\\\\\\\\\)*\\)#+[ \t]*")
+ (setq-local syntax-propertize-function
+ ;; In the main syntax-table, \ is marked as a punctuation,
because
+ ;; of its use in DOS-style directory separators. Here we try to
+ ;; recognize the cases where \ is used as an escape inside
strings.
+ (syntax-propertize-rules ("\\(\\(?:\\\\\\)+\\)\"" (1 "\\"))))
+ (setq-local parens-require-spaces nil)
+ (setq-local comment-start "# ")
+ (setq-local comment-start-skip
+ "\\(\\(?:^\\|[^\\\n]\\)\\(?:\\\\\\\\\\)*\\)#+[ \t]*")
;; Like Lisp mode. Without this, we lose with, say,
;; `backward-up-list' when there's an unbalanced quote in a
;; preceding comment.
- (set (make-local-variable 'parse-sexp-ignore-comments) t))
+ (setq-local parse-sexp-ignore-comments t))
(defun cfengine-common-syntax (table)
;; The syntax defaults seem OK to give reasonable word movement.
@@ -1374,7 +1374,7 @@ to the action header."
(cfengine-common-settings)
(cfengine-common-syntax cfengine3-mode-syntax-table)
- (set (make-local-variable 'indent-line-function) #'cfengine3-indent-line)
+ (setq-local indent-line-function #'cfengine3-indent-line)
(setq font-lock-defaults
'(cfengine3-font-lock-keywords
@@ -1384,11 +1384,11 @@ to the action header."
;; `compile-command' is almost never a `make' call with CFEngine so
;; we override it
(when cfengine-cf-promises
- (set (make-local-variable 'compile-command)
- (concat cfengine-cf-promises
- " -f "
- (when buffer-file-name
- (shell-quote-argument buffer-file-name)))))
+ (setq-local compile-command
+ (concat cfengine-cf-promises
+ " -f "
+ (when buffer-file-name
+ (shell-quote-argument buffer-file-name)))))
(add-hook 'eldoc-documentation-functions
#'cfengine3-documentation-function nil t)
@@ -1418,20 +1418,18 @@ to the action header."
;; should avoid potential confusion in some cases.
(modify-syntax-entry ?\` "\"" cfengine2-mode-syntax-table)
- (set (make-local-variable 'indent-line-function) #'cfengine2-indent-line)
- (set (make-local-variable 'outline-regexp) "[ \t]*\\(\\sw\\|\\s_\\)+:+")
- (set (make-local-variable 'outline-level) #'cfengine2-outline-level)
- (set (make-local-variable 'fill-paragraph-function)
- #'cfengine-fill-paragraph)
+ (setq-local indent-line-function #'cfengine2-indent-line)
+ (setq-local outline-regexp "[ \t]*\\(\\sw\\|\\s_\\)+:+")
+ (setq-local outline-level #'cfengine2-outline-level)
+ (setq-local fill-paragraph-function #'cfengine-fill-paragraph)
(define-abbrev-table 'cfengine2-mode-abbrev-table cfengine-mode-abbrevs)
(setq font-lock-defaults
'(cfengine2-font-lock-keywords nil nil nil beginning-of-line))
;; Fixme: set the args of functions in evaluated classes to string
;; syntax, and then obey syntax properties.
(setq imenu-generic-expression cfengine2-imenu-expression)
- (set (make-local-variable 'beginning-of-defun-function)
- #'cfengine2-beginning-of-defun)
- (set (make-local-variable 'end-of-defun-function) #'cfengine2-end-of-defun))
+ (setq-local beginning-of-defun-function #'cfengine2-beginning-of-defun)
+ (setq-local end-of-defun-function #'cfengine2-end-of-defun))
;;;###autoload
(defun cfengine-auto-mode ()
- master updated (2581beb -> 22caab8), Stefan Kangas, 2020/12/09
- master 4248d60 1/7: * lisp/progmodes/sql.el: Remove redundant URL., Stefan Kangas, 2020/12/09
- master 3d6498c 3/7: Prefer setq-local in sql.el, Stefan Kangas, 2020/12/09
- master dc0295c 4/7: Prefer setq-local in cfengine.el,
Stefan Kangas <=
- master 7ebd7ba 5/7: Prefer setq-local in etags.el, Stefan Kangas, 2020/12/09
- master 22caab8 7/7: Prefer setq-local in some remaining progmodes, Stefan Kangas, 2020/12/09
- master ec42ff3 2/7: Prefer setq-local in font-lock.el, Stefan Kangas, 2020/12/09
- master dbc044e 6/7: Prefer setq-local in gdb-mi.el, Stefan Kangas, 2020/12/09