Require missing packages for byte-compile build

Author: tonini

elixir-mode.el

@@ -36,8 +36,9 @@
 
 ;;; Code:
 
-(require 'easymenu)           ; for menubar features
-(require 'elixir-smie)        ; syntax and indentation support
+(require 'easymenu)           ; Elixir Mode menu definition
+(require 'elixir-smie)        ; Syntax and indentation support
+(require 'pkg-info)           ; Display Elixir Mode package version
 
 (defgroup elixir nil
   "Major mode for editing Elixir code."

elixir-smie.el

@@ -25,7 +25,8 @@
 
 ;;; Code:
 
-(require 'smie)
+(require 'smie)           ; Simple minded indentation engine
+(require 'cl-lib)         ; `cl-flet'
 
 ;; HACK: Patch for Emacs 24.3 smie that fix
 ;; https://github.com/elixir-lang/emacs-elixir/issues/107.
@@ -66,10 +67,8 @@
                                (rassoc next smie-closer-alist))))
                      (smie-indent-calculate))))))))
 
-;; FIXME: This is me being lazy. CL is a compile-time dep only.
-;; (But for now, there is no real file-compilation plot, so let's
-;; scrape by with the runtime dep.)
-(require 'cl)
+;; Declare variable that we need from the smie package
+(defvar smie--parent)
 
 (defvar elixir-smie-verbose-p nil
   "Emit context information about the current syntax state.")

test/elixir-mode-indentation-test.el

@@ -809,14 +809,13 @@ end"
                              (:tags '(indentation))
   "
 def foo do
-  case is_string(x) do
+case is_string(x) do
     true ->
-      x2 = \" one\"
-      x <> x2
-
-    false ->
-      x2 = \" two\"
+x2 = \" one\"
       x <> x2
+false ->
+         x2 = \" two\"
+  x <> x2
   end
 end"
   "
@@ -825,7 +824,6 @@ def foo do
     true ->
       x2 = \" one\"
       x <> x2
-
     false ->
       x2 = \" two\"
       x <> x2

test/test-helper.el

@@ -5,7 +5,8 @@
 
 ;;; Code:
 
-(require 'ert-x)
+(require 'ert-x)          ; `ert-with-test-buffer'
+(require 'cl-lib)         ; `cl-defmacro'
 
 (message "Running tests on Emacs %s" emacs-version)
 
@@ -19,15 +20,15 @@
 
 ;; Helpers
 
-(defmacro* elixir-deftest (name args &body body)
+(cl-defmacro elixir-deftest (name args &body body)
   (declare (indent 2))
   `(ert-deftest ,(intern (format "elixir-ert-%s" name)) ()
      ""
      ,@args
      (let ((elixir-smie-verbose-p t))
        ,@body)))
 
-(defmacro* elixir-ert-with-test-buffer ((&rest args) initial-contents &body body)
+(cl-defmacro elixir-ert-with-test-buffer ((&rest args) initial-contents &body body)
   (declare (indent 2))
   `(ert-with-test-buffer (,@args)
      (elixir-mode)
@@ -45,7 +46,7 @@
      (goto-char (point-min))
      ,@body))
 
-(defmacro* elixir-def-indentation-test (name args initial-contents expected-output)
+(cl-defmacro elixir-def-indentation-test (name args initial-contents expected-output)
   (declare (indent 2))
   `(elixir-deftest ,name ,args
      (elixir-ert-with-test-buffer (:name ,(format "(Expected)" name))