[elpa] externals/bnf-mode 8e69700 18/36: Merge pull request #14 from sergeyklay/minor-fixes

[Stefan Monnier]

branch: externals/bnf-mode
commit 8e697006f018b61a837ed1cc6b853009847b5bf1
Merge: 164101e 0f7ebc1
Author: Serghei Iakovlev <sergeyklay@users.noreply.github.com>
Commit: GitHub <noreply@github.com>

    Merge pull request #14 from sergeyklay/minor-fixes
    
    Minor fixes and cleanup
---
 .codecov.yml                    |  2 +-
 LICENSE                         |  8 ++++----
 Makefile                        |  7 ++-----
 bnf-mode.el                     |  5 +----
 default.mk                      |  5 ++++-
 test/test-bnf-mode-font-lock.el | 14 +++++++++++---
 test/utils.el                   | 10 ----------
 7 files changed, 23 insertions(+), 28 deletions(-)

diff --git a/.codecov.yml b/.codecov.yml
index 90afaf3..a7ca5be 100644
--- a/.codecov.yml
+++ b/.codecov.yml
@@ -49,4 +49,4 @@ ignore:
   # ignore folders and all its contents
   - ".cask/.*"
   - ".github/.*"
-  - "test/.*"
+  - "test/test-.*"
diff --git a/LICENSE b/LICENSE
index 20d40b6..e72bfdd 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,7 +1,7 @@
                     GNU GENERAL PUBLIC LICENSE
                        Version 3, 29 June 2007
 
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
@@ -645,7 +645,7 @@ the "copyright" line and a pointer to where the full notice 
is found.
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 Also add information on how to contact you by electronic and paper mail.
 
@@ -664,11 +664,11 @@ might be different; for a GUI interface, you would use an 
"about box".
   You should also get your employer (if you work as a programmer) or school,
 if any, to sign a "copyright disclaimer" for the program, if necessary.
 For more information on this, and how to apply and follow the GNU GPL, see
-<http://www.gnu.org/licenses/>.
+<https://www.gnu.org/licenses/>.
 
   The GNU General Public License does not permit incorporating your program
 into proprietary programs.  If your program is a subroutine library, you
 may consider it more useful to permit linking proprietary applications with
 the library.  If this is what you want to do, use the GNU Lesser General
 Public License instead of this License.  But first, please read
-<http://www.gnu.org/philosophy/why-not-lgpl.html>.
\ No newline at end of file
+<https://www.gnu.org/licenses/why-not-lgpl.html>.
\ No newline at end of file
diff --git a/Makefile b/Makefile
index 1704b98..6178bd7 100644
--- a/Makefile
+++ b/Makefile
@@ -17,9 +17,6 @@
 
 include default.mk
 
-# Run “make build” by default
-.DEFAULT_GOAL = build
-
 %.info: %.texi
        $(info Generating $@)
        @$(MAKEINFO) --no-split $< -o $@
@@ -56,7 +53,7 @@ $(ARCHIVE_NAME).tar: $(ARCHIVE_CONTENTS)
 
 .PHONY: .title
 .title:
-       $(info BNF Mode $(VERSION))
+       @echo "BNF Mode $(VERSION)"
 
 .PHONY: init
 init: Cask
@@ -115,5 +112,5 @@ help: .title
        @echo '  $(CASK): $(if $(HAVE_CASK),yes,no)'
        @echo ''
        @echo 'You need $(CASK) to develop BNF Mode.'
-       @echo 'See http://cask.readthedocs.io/ for more.'
+       @echo 'See https://cask.readthedocs.io/ for more.'
        @echo ''
diff --git a/bnf-mode.el b/bnf-mode.el
index 879aaaa..c04a0ff 100644
--- a/bnf-mode.el
+++ b/bnf-mode.el
@@ -8,6 +8,7 @@
 ;; URL: https://github.com/sergeyklay/bnf-mode
 ;; Keywords: languages
 ;; Package-Requires: ((cl-lib "0.5") (emacs "24.3"))
+;; Revision: $Format:%h (%cD %d)$
 
 ;;;; License
 
@@ -24,10 +25,6 @@
 ;; You should have received a copy of the GNU General Public License
 ;; along with this file.  If not, see <https://www.gnu.org/licenses/>.
 
-;; This field is expanded to commit SHA, date & associated heads/tags during
-;; archive creation.
-;; Revision: $Format:%h (%cD %d)$
-
 ;;; Commentary:
 
 ;;   BNF Mode is a GNU Emacs major mode for editing BNF grammars.  Presently it
diff --git a/default.mk b/default.mk
index ae4310c..21b218e 100644
--- a/default.mk
+++ b/default.mk
@@ -17,6 +17,9 @@
 
 TOP := $(dir $(lastword $(MAKEFILE_LIST)))
 
+# Run “make build” by default
+.DEFAULT_GOAL = build
+
 EMACS  ?= emacs
 CASK   ?= cask
 PANDOC ?= pandoc
@@ -44,7 +47,7 @@ else
 RUNEMACS = $(CASK) exec $(EMACSBATCH)
 endif
 
-VERSION = 0.4.4
+VERSION="$(shell sed -nre '/^;; Version:/ { s/^;; Version:[ \t]+//; p }' 
bnf-mode.el)"
 
 PACKAGE = bnf-mode
 ARCHIVE_NAME = $(PACKAGE)-$(VERSION)
diff --git a/test/test-bnf-mode-font-lock.el b/test/test-bnf-mode-font-lock.el
index 2bdb38b..046ef63 100644
--- a/test/test-bnf-mode-font-lock.el
+++ b/test/test-bnf-mode-font-lock.el
@@ -29,9 +29,17 @@
 ;;; Code:
 
 (require 'buttercup)
-(load (concat (file-name-directory (or load-file-name (buffer-file-name)
-                                       default-directory))
-              "utils.el") nil 'nomessage 'nosuffix)
+
+(when (require 'undercover nil t)
+  ;; Track coverage, but don't send to coverage serivice.  Save in parent
+  ;; directory as undercover saves paths relative to the repository root.
+  (undercover "*.el" "test/utils.el"
+              (:report-file "coverage-final.json")
+              (:send-report nil)))
+
+(let* ((current-dir (file-name-directory (or load-file-name (buffer-file-name)
+                                             default-directory))))
+  (load (concat current-dir "utils.el") nil 'nomessage 'nosuffix))
 
 
 ;;;; Tests
diff --git a/test/utils.el b/test/utils.el
index 9d8ace7..8ef5e69 100644
--- a/test/utils.el
+++ b/test/utils.el
@@ -31,16 +31,6 @@
 (require 'buttercup)
 (require 'cl-lib)    ; `cl-defmacro'
 
-;; Make sure the exact Emacs version can be found in the build output
-(message "Running tests on Emacs %s" emacs-version)
-
-(when (require 'undercover nil t)
-  ;; Track coverage, but don't send to coverage serivice.  Save in parent
-  ;; directory as undercover saves paths relative to the repository root.
-  (undercover "*.el"
-              (:report-file "coverage-final.json")
-              (:send-report nil)))
-
 (let* ((current-file (if load-in-progress load-file-name (buffer-file-name)))
        (source-directory (locate-dominating-file current-file "Cask"))
        ;; Don't load old byte-compiled versions