From e71fe3ee31acc8a3b8f7a3d529fd4ee902d9b1f2 Mon Sep 17 00:00:00 2001
From: Adam Porter <adam@alphapapa.net>
Date: Wed, 2 Dec 2020 14:24:10 -0600
Subject: [PATCH] Meta: Update makem.sh, etc.

---
 .github/workflows/test.yml |  8 ++++----
 Makefile                   |  2 +-
 makem.sh                   | 14 +++++++++-----
 3 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 0fd1711..f4e6b95 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -1,7 +1,7 @@
 # * test.yml --- Test Emacs packages using makem.sh on GitHub Actions
 
 # URL: https://github.com/alphapapa/makem.sh
-# Version: 0.4.1
+# Version: 0.4.2
 
 # * Commentary:
 
@@ -31,8 +31,8 @@ on:
   pull_request:
   push:
     # Comment out this section to enable testing of all branches.
-    # branches:
-    #   - master
+    branches:
+      - master
 
 jobs:
   build:
@@ -63,7 +63,7 @@ jobs:
     - name: Lint
       # NOTE: Uncomment this line to treat lint failures as passing
       #       so the job doesn't show failure.
-      continue-on-error: true
+      # continue-on-error: true
       run: ./makem.sh -vv --sandbox=$SANDBOX_DIR lint
 
     - name: Test
diff --git a/Makefile b/Makefile
index a9d22f4..1274e88 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 # * makem.sh/Makefile --- Script to aid building and testing Emacs Lisp packages
 
 # URL: https://github.com/alphapapa/makem.sh
-# Version: 0.4.1
+# Version: 0.4.2
 
 # * Arguments
 
diff --git a/makem.sh b/makem.sh
index 4f2c561..863c2e5 100755
--- a/makem.sh
+++ b/makem.sh
@@ -3,7 +3,7 @@
 # * makem.sh --- Script to aid building and testing Emacs Lisp packages
 
 # URL: https://github.com/alphapapa/makem.sh
-# Version: 0.4.1
+# Version: 0.4.2
 
 # * Commentary:
 
@@ -233,7 +233,6 @@ function elisp-package-initialize-file {
                              (cons "melpa-stable" "https://stable.melpa.org/packages/")))
 $elisp_org_package_archive
 (package-initialize)
-(setq load-prefer-newer t)
 EOF
     echo $file
 }
@@ -246,6 +245,7 @@ function run_emacs {
     local emacs_command=(
         "${emacs_command[@]}"
         -Q
+        --eval "(setq load-prefer-newer t)"
         "${args_debug[@]}"
         "${args_sandbox[@]}"
         -l $package_initialize_file
@@ -379,7 +379,8 @@ function args-load-files {
     # For file in $@, echo "--load $file".
     for file in "$@"
     do
-        printf -- '--load %q ' "$file"
+        sans_extension=${file%%.el}
+        printf -- '--load %q ' "$sans_extension"
     done
 }
 
@@ -766,12 +767,15 @@ function batch {
 
 function interactive {
     # Run Emacs interactively.  Most useful with --sandbox and --install-deps.
+    local load_file_args=$(args-load-files "${files_project_feature[@]}" "${files_project_test[@]}")
     verbose 1 "Running Emacs interactively..."
-    verbose 2 "Loading files:" "${files_project_feature[@]}" "${files_project_test[@]}"
+    verbose 2 "Loading files: ${load_file_args//--load /}"
+
+    [[ $compile ]] && compile
 
     unset arg_batch
     run_emacs \
-        $(args-load-files "${files_project_feature[@]}" "${files_project_test[@]}") \
+        $load_file_args \
         --eval "(load user-init-file)" \
         "${args_batch_interactive[@]}"
     arg_batch="--batch"