From e1e57cc5fe9f3a4dce39516a8469487ecbb239fe Mon Sep 17 00:00:00 2001 From: USAMI Kenta Date: Fri, 31 Jul 2020 04:38:30 +0900 Subject: [PATCH 1/3] Set package-lint-main-file for package-lint --- .dir-locals.el | 1 + tests/.dir-locals.el | 1 + 2 files changed, 2 insertions(+) create mode 100644 .dir-locals.el create mode 100644 tests/.dir-locals.el diff --git a/.dir-locals.el b/.dir-locals.el new file mode 100644 index 00000000..f3f3a384 --- /dev/null +++ b/.dir-locals.el @@ -0,0 +1 @@ +((emacs-lisp-mode (package-lint-main-file . "php-mode.el"))) diff --git a/tests/.dir-locals.el b/tests/.dir-locals.el new file mode 100644 index 00000000..d18ca3ff --- /dev/null +++ b/tests/.dir-locals.el @@ -0,0 +1 @@ +((emacs-lisp-mode (package-lint-main-file . "../php-mode.el"))) From 305cb4c72434b60b794f789d28129ef16ed60610 Mon Sep 17 00:00:00 2001 From: USAMI Kenta Date: Fri, 31 Jul 2020 04:40:38 +0900 Subject: [PATCH 2/3] Remove redundant Package-Requires header --- lisp/php-local-manual.el | 1 - php-align.el | 1 - php-face.el | 1 - php-mode-debug.el | 1 - php-project.el | 1 - php.el | 1 - 6 files changed, 6 deletions(-) diff --git a/lisp/php-local-manual.el b/lisp/php-local-manual.el index effb41de..6601ed65 100644 --- a/lisp/php-local-manual.el +++ b/lisp/php-local-manual.el @@ -7,7 +7,6 @@ ;; URL: https://github.com/emacs-php/php-mode ;; Keywords: docs, php ;; Version: 2.0.0 -;; Package-Requires: ((emacs "25.2")) ;; License: GPL-3.0-or-later ;; This program is free software; you can redistribute it and/or modify diff --git a/php-align.el b/php-align.el index 084f8857..648ceac0 100644 --- a/php-align.el +++ b/php-align.el @@ -8,7 +8,6 @@ ;; Keywords: php languages convenience align ;; Homepage: https://github.com/emacs-php/php-mode ;; Version: 1.23.0 -;; Package-Requires: ((emacs "24.3")) ;; License: GPL-3.0-or-later ;; This program is free software; you can redistribute it and/or modify diff --git a/php-face.el b/php-face.el index cb6a95f9..ac6f48da 100644 --- a/php-face.el +++ b/php-face.el @@ -7,7 +7,6 @@ ;; Version: 1.23.0 ;; Keywords: faces, php ;; Homepage: https://github.com/emacs-php/php-mode -;; Package-Requires: ((emacs "24.3")) ;; License: GPL-3.0-or-later ;; This program is free software; you can redistribute it and/or modify diff --git a/php-mode-debug.el b/php-mode-debug.el index 1e75aa15..01f02a04 100644 --- a/php-mode-debug.el +++ b/php-mode-debug.el @@ -6,7 +6,6 @@ ;; URL: https://github.com/emacs-php/php-mode ;; Keywords: maint ;; Version: 1.23.0 -;; Package-Requires: ((emacs "24.3")) ;; License: GPL-3.0-or-later ;; This program is free software; you can redistribute it and/or modify diff --git a/php-project.el b/php-project.el index 6e305a7b..5f4236d1 100644 --- a/php-project.el +++ b/php-project.el @@ -6,7 +6,6 @@ ;; Keywords: tools, files ;; URL: https://github.com/emacs-php/php-mode ;; Version: 1.23.0 -;; Package-Requires: ((emacs "24.3")) ;; License: GPL-3.0-or-later ;; This program is free software; you can redistribute it and/or modify diff --git a/php.el b/php.el index ce532c17..e417fa18 100644 --- a/php.el +++ b/php.el @@ -7,7 +7,6 @@ ;; Version: 1.23.0 ;; Keywords: languages, php ;; Homepage: https://github.com/emacs-php/php-mode -;; Package-Requires: ((emacs "24.3")) ;; License: GPL-3.0-or-later ;; This program is free software; you can redistribute it and/or modify From 84767fb35373d1f8bbbf1dcfcf11a46001fe4a55 Mon Sep 17 00:00:00 2001 From: USAMI Kenta Date: Fri, 31 Jul 2020 04:42:08 +0900 Subject: [PATCH 3/3] Use files instead of package-file without php-mode.el It is not necessary to specify in package-file except the main file of the package. --- Cask | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/Cask b/Cask index 49af2fb6..a37bc60b 100644 --- a/Cask +++ b/Cask @@ -1,11 +1,13 @@ (package "php-mode" "1.23.0" "Major mode for editing PHP code") (source melpa) -(package-file "php.el") -(package-file "php-face.el") (package-file "php-mode.el") -(package-file "php-project.el") -(package-file "php-mode-debug.el") + +(files + "php.el" + "php-face.el" + "php-project.el" + "php-mode-debug.el") (development (depends-on "pkg-info")