diff options
| author | Stefan Kangas | 2024-12-19 01:33:56 +0100 |
|---|---|---|
| committer | Stefan Kangas | 2024-12-19 01:40:12 +0100 |
| commit | cd7e462ea31491d93d5e781ec0343c37e024bea7 (patch) | |
| tree | 5e082d578dd17f5047a4d350ee030feed1307879 | |
| parent | 807b6172524a7b4f3fe19bc22a06afd48cc57b71 (diff) | |
| download | emacs-cd7e462ea31491d93d5e781ec0343c37e024bea7.tar.gz emacs-cd7e462ea31491d93d5e781ec0343c37e024bea7.zip | |
; Fix more obsoletion warnings
* lisp/progmodes/cc-awk.el (awk-font-lock-keywords):
* lisp/progmodes/cc-fonts.el (c-basic-matchers-before):
* lisp/progmodes/csharp-mode.el (c-basic-matchers-before): Use faces
instead of variables to silence an obsoletion warning. (Bug#71469)
| -rw-r--r-- | lisp/progmodes/cc-awk.el | 4 | ||||
| -rw-r--r-- | lisp/progmodes/cc-fonts.el | 2 | ||||
| -rw-r--r-- | lisp/progmodes/csharp-mode.el | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/lisp/progmodes/cc-awk.el b/lisp/progmodes/cc-awk.el index b71442c4751..a40999e6334 100644 --- a/lisp/progmodes/cc-awk.el +++ b/lisp/progmodes/cc-awk.el | |||
| @@ -966,11 +966,11 @@ | |||
| 966 | ;; Function declarations. | 966 | ;; Function declarations. |
| 967 | `(,(c-make-font-lock-search-function | 967 | `(,(c-make-font-lock-search-function |
| 968 | "^\\s *\\(func\\(tion\\)?\\)\\s +\\(\\(\\sw+\\(::\\sw+\\)?\\)\\s *\\)?\\(([^()]*)\\)?" | 968 | "^\\s *\\(func\\(tion\\)?\\)\\s +\\(\\(\\sw+\\(::\\sw+\\)?\\)\\s *\\)?\\(([^()]*)\\)?" |
| 969 | '(1 font-lock-keyword-face t) | 969 | '(1 'font-lock-keyword-face t) |
| 970 | ;; We can't use LAXMATCH in `c-make-font-lock-search-function', so.... | 970 | ;; We can't use LAXMATCH in `c-make-font-lock-search-function', so.... |
| 971 | '((when (match-beginning 4) | 971 | '((when (match-beginning 4) |
| 972 | (c-put-font-lock-face | 972 | (c-put-font-lock-face |
| 973 | (match-beginning 4) (match-end 4) font-lock-function-name-face) | 973 | (match-beginning 4) (match-end 4) 'font-lock-function-name-face) |
| 974 | nil)) | 974 | nil)) |
| 975 | ;; Put warning face on any use of :: inside the parens. | 975 | ;; Put warning face on any use of :: inside the parens. |
| 976 | '((when (match-beginning 6) | 976 | '((when (match-beginning 6) |
diff --git a/lisp/progmodes/cc-fonts.el b/lisp/progmodes/cc-fonts.el index b18561667f8..b2752bddf43 100644 --- a/lisp/progmodes/cc-fonts.el +++ b/lisp/progmodes/cc-fonts.el | |||
| @@ -898,7 +898,7 @@ casts and declarations are fontified. Used on level 2 and higher." | |||
| 898 | (c-lang-const c-simple-ws) "*" | 898 | (c-lang-const c-simple-ws) "*" |
| 899 | "=\\(?:[^=]\\|$\\)") | 899 | "=\\(?:[^=]\\|$\\)") |
| 900 | `((,(+ 1 (c-lang-const c-simple-ws-depth)) | 900 | `((,(+ 1 (c-lang-const c-simple-ws-depth)) |
| 901 | font-lock-type-face t))))))))) | 901 | 'font-lock-type-face t))))))))) |
| 902 | 902 | ||
| 903 | ;; Fontify the special declarations in Objective-C. | 903 | ;; Fontify the special declarations in Objective-C. |
| 904 | ,@(when (c-major-mode-is 'objc-mode) | 904 | ,@(when (c-major-mode-is 'objc-mode) |
diff --git a/lisp/progmodes/csharp-mode.el b/lisp/progmodes/csharp-mode.el index 0438a25242b..4cc59cc0052 100644 --- a/lisp/progmodes/csharp-mode.el +++ b/lisp/progmodes/csharp-mode.el | |||
| @@ -335,7 +335,7 @@ | |||
| 335 | ;; Chained identifiers in using/namespace statements | 335 | ;; Chained identifiers in using/namespace statements |
| 336 | ,`(,(c-make-font-lock-search-function | 336 | ,`(,(c-make-font-lock-search-function |
| 337 | csharp--regex-using-or-namespace | 337 | csharp--regex-using-or-namespace |
| 338 | `((csharp--color-forwards font-lock-variable-name-face) | 338 | `((csharp--color-forwards 'font-lock-variable-name-face) |
| 339 | nil | 339 | nil |
| 340 | (goto-char (match-end 0))))) | 340 | (goto-char (match-end 0))))) |
| 341 | 341 | ||
| @@ -348,7 +348,7 @@ | |||
| 348 | 348 | ||
| 349 | ;; Single identifier in attribute | 349 | ;; Single identifier in attribute |
| 350 | (eval . (list (concat "\\[" csharp--regex-type-name-matcher "\\][^;]") | 350 | (eval . (list (concat "\\[" csharp--regex-type-name-matcher "\\][^;]") |
| 351 | 1 font-lock-variable-name-face t)) | 351 | 1 'font-lock-variable-name-face t)) |
| 352 | 352 | ||
| 353 | ;; Function names | 353 | ;; Function names |
| 354 | (eval . (list "\\([A-Za-z0-9_]+\\)\\(<[a-zA-Z0-9, ]+>\\)?(" | 354 | (eval . (list "\\([A-Za-z0-9_]+\\)\\(<[a-zA-Z0-9, ]+>\\)?(" |
| @@ -361,7 +361,7 @@ | |||
| 361 | (eval . (list (concat "\\<nameof\\> *( *" | 361 | (eval . (list (concat "\\<nameof\\> *( *" |
| 362 | csharp--regex-identifier-matcher | 362 | csharp--regex-identifier-matcher |
| 363 | " *) *") | 363 | " *) *") |
| 364 | 1 font-lock-variable-name-face)) | 364 | 1 'font-lock-variable-name-face)) |
| 365 | 365 | ||
| 366 | ;; Catch statements with type only | 366 | ;; Catch statements with type only |
| 367 | (eval . (list (concat "\\<catch\\> *( *" | 367 | (eval . (list (concat "\\<catch\\> *( *" |