Skip to content

Commit e1d8d33

Browse files
committed
Use package-lint-main-file for main merlin package linting
1 parent 49d97d5 commit e1d8d33

File tree

1 file changed

+12
-1
lines changed

1 file changed

+12
-1
lines changed

emacs/check.sh

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ NEEDED_PACKAGES="package-lint company iedit auto-complete compat"
88
ELS_TO_CHECK=*.el
99
# To reduce the amount of false positives we only package-lint files
1010
# that are actual installable packages.
11-
PKGS_TO_CHECK="merlin.el merlin-ac.el merlin-company.el merlin-iedit.el merlin-cap.el tests/merlin-cap-test.el"
11+
PKGS_TO_CHECK="merlin-ac.el merlin-company.el merlin-iedit.el"
1212

1313
INIT_PACKAGE_EL="(progn \
1414
(require 'package) \
@@ -51,6 +51,17 @@ EMACS_PACKAGE_LINT_IGNORE=1
5151
-f package-lint-batch-and-exit \
5252
${PKGS_TO_CHECK} || [ -n "${EMACS_PACKAGE_LINT_IGNORE:+x}" ]
5353

54+
55+
PKGS_TO_CHECK="merlin.el merlin-cap.el"
56+
57+
"$EMACS" -Q -batch \
58+
--eval "$INIT_PACKAGE_EL" \
59+
-L . \
60+
--eval "(require 'package-lint)" \
61+
--eval "(setq package-lint-main-file \"merlin.el\")" \
62+
-f package-lint-batch-and-exit \
63+
${PKGS_TO_CHECK} || [ -n "${EMACS_PACKAGE_LINT_IGNORE:+x}" ]
64+
5465
# Run tests in batch mode.
5566
"$EMACS" -Q -batch \
5667
--eval "$INIT_PACKAGE_EL" \

0 commit comments

Comments
 (0)