branch: elpa/flycheck
commit a3e57b179a574bafe4ca6d1f0bd39c0d3d3283ef
Author: Bozhidar Batsov <[email protected]>
Commit: GitHub <[email protected]>
ci: Fix Emacs snapshot compatibility (#2150)
Disable cc-mode derivative packages (d-mode, php-mode, protobuf-mode,
processing-mode, js3-mode, rpm-spec-mode, typescript-mode) that fail
to install on Emacs snapshot due to cyclic references in cc-mode
keyword variables.
Add checkdoc-allow-quoting-nil-and-t and checkdoc-arguments-missing-flag
to flycheck-emacs-lisp-checkdoc-variables for Emacs 31+.
---
Eask | 16 +++++++++-------
flycheck.el | 5 ++++-
2 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/Eask b/Eask
index a1ecbeb7bc..00839d65cd 100644
--- a/Eask
+++ b/Eask
@@ -30,7 +30,15 @@
(depends-on "coffee-mode")
(depends-on "cperl-mode")
(depends-on "cwl-mode")
- (depends-on "d-mode")
+ ;; cc-mode derivatives broken on Emacs snapshot (cyclic reference in
c-*-kwds).
+ ;; Re-enable once cc-mode compatibility is fixed upstream.
+ ;; (depends-on "d-mode")
+ ;; (depends-on "php-mode")
+ ;; (depends-on "protobuf-mode")
+ ;; (depends-on "processing-mode")
+ ;; (depends-on "js3-mode")
+ ;; (depends-on "rpm-spec-mode")
+ ;; (depends-on "typescript-mode")
(depends-on "dockerfile-mode")
(depends-on "elixir-mode")
(depends-on "erlang")
@@ -42,7 +50,6 @@
(depends-on "handlebars-mode")
(depends-on "haskell-mode")
(depends-on "js2-mode")
- (depends-on "js3-mode")
(depends-on "rjsx-mode")
(depends-on "json-mode")
(depends-on "julia-mode")
@@ -51,14 +58,10 @@
(depends-on "markdown-mode")
(depends-on "mmm-mode")
(depends-on "nix-mode")
- (depends-on "php-mode")
- (depends-on "processing-mode")
- (depends-on "protobuf-mode")
(depends-on "pug-mode")
(depends-on "puppet-mode")
;; (depends-on "racket-mode") ;;
https://github.com/greghendershott/racket-mode/issues/461
(depends-on "rhtml-mode")
- (depends-on "rpm-spec-mode")
(depends-on "rust-mode")
(depends-on "sass-mode")
(depends-on "scala-mode")
@@ -67,6 +70,5 @@
(depends-on "systemd")
(depends-on "terraform-mode")
(depends-on "tuareg")
- (depends-on "typescript-mode")
(depends-on "web-mode")
(depends-on "yaml-mode"))
diff --git a/flycheck.el b/flycheck.el
index ccadbb121a..b480d723fb 100644
--- a/flycheck.el
+++ b/flycheck.el
@@ -8913,7 +8913,10 @@ See Info Node `(elisp)Byte Compilation'."
checkdoc-max-keyref-before-warn
sentence-end-double-space
,@(and (>= emacs-major-version 28)
- '(checkdoc-column-zero-backslash-before-paren)))
+ '(checkdoc-column-zero-backslash-before-paren))
+ ,@(and (>= emacs-major-version 31)
+ '(checkdoc-allow-quoting-nil-and-t
+ checkdoc-arguments-missing-flag)))
"Variables inherited by the checkdoc subprocess.")
(defun flycheck-emacs-lisp-checkdoc-variables-form ()