From 533047c2e524edbe71de421312692fcbcb9d1fea Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Sat, 16 Sep 2006 17:52:32 +0000 Subject: [PATCH] (font-lock-compile-keywords): Rename optional arg to SYNTACTIC-KEYWORDS and reverse the sense. All callers changed. --- lisp/font-lock.el | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/lisp/font-lock.el b/lisp/font-lock.el index 241a09b7908..a63d726d2fd 100644 --- a/lisp/font-lock.el +++ b/lisp/font-lock.el @@ -718,7 +718,7 @@ see the variables `c-font-lock-extra-types', `c++-font-lock-extra-types', ;; If the keywords were compiled before, compile them again. (if was-compiled (setq font-lock-keywords - (font-lock-compile-keywords font-lock-keywords t))))))) + (font-lock-compile-keywords font-lock-keywords))))))) (defun font-lock-update-removed-keyword-alist (mode keywords how) "Update `font-lock-removed-keywords-alist' when adding new KEYWORDS to MODE." @@ -825,7 +825,7 @@ happens, so the major mode can be corrected." ;; If the keywords were compiled before, compile them again. (if was-compiled (setq font-lock-keywords - (font-lock-compile-keywords font-lock-keywords t))))))) + (font-lock-compile-keywords font-lock-keywords))))))) ;;; Font Lock Support mode. @@ -1414,7 +1414,8 @@ START should be at the beginning of a line." ;; If `font-lock-syntactic-keywords' is not compiled, compile it. (unless (eq (car font-lock-syntactic-keywords) t) (setq font-lock-syntactic-keywords (font-lock-compile-keywords - font-lock-syntactic-keywords))) + font-lock-syntactic-keywords + t))) ;; Get down to business. (let ((case-fold-search font-lock-keywords-case-fold-search) (keywords (cddr font-lock-syntactic-keywords)) @@ -1570,7 +1571,7 @@ START should be at the beginning of a line. LOUDLY, if non-nil, allows progress-meter bar." (unless (eq (car font-lock-keywords) t) (setq font-lock-keywords - (font-lock-compile-keywords font-lock-keywords t))) + (font-lock-compile-keywords font-lock-keywords))) (let ((case-fold-search font-lock-keywords-case-fold-search) (keywords (cddr font-lock-keywords)) (bufname (buffer-name)) (count 0) @@ -1626,12 +1627,12 @@ LOUDLY, if non-nil, allows progress-meter bar." ;; Various functions. -(defun font-lock-compile-keywords (keywords &optional regexp) +(defun font-lock-compile-keywords (keywords &optional syntactic-keywords) "Compile KEYWORDS into the form (t KEYWORDS COMPILED...) Here each COMPILED is of the form (MATCHER HIGHLIGHT ...) as shown in the `font-lock-keywords' doc string. -If REGEXP is non-nil, it means these keywords are used for -`font-lock-keywords' rather than for `font-lock-syntactic-keywords'." +If SYNTACTIC-KEYWORDS is non-nil, it means these keywords are used for +`font-lock-syntactic-keywords' rather than for `font-lock-keywords'." (if (not font-lock-set-defaults) ;; This should never happen. But some external packages sometimes ;; call font-lock in unexpected and incorrect ways. It's important to @@ -1644,7 +1645,7 @@ If REGEXP is non-nil, it means these keywords are used for (setq keywords (cons t (cons keywords (mapcar 'font-lock-compile-keyword keywords)))) - (if (and regexp + (if (and (not syntactic-keywords) (eq (or syntax-begin-function font-lock-beginning-of-syntax-function) 'beginning-of-defun) @@ -1774,7 +1775,7 @@ Sets various variables using `font-lock-defaults' (or, if nil, using ;; Now compile the keywords. (unless (eq (car font-lock-keywords) t) (setq font-lock-keywords - (font-lock-compile-keywords font-lock-keywords t)))))) + (font-lock-compile-keywords font-lock-keywords)))))) ;;; Colour etc. support. -- 2.39.2