From 8a145cacf872cf2f292337a67516cdc4e29a02ba Mon Sep 17 00:00:00 2001
From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Wed, 27 Dec 2017 21:11:38 -0500
Subject: [PATCH 1/2] Fix compilation issues in elpa.git

* dev/examples.el: Require examples-to-tests to make it compilable.
* .gitignore: Add a general .elc rule to also catch dev/*.elc.
---
 .gitignore      | 3 +--
 dev/examples.el | 5 ++++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 4ec8ea2..d6d59bd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,3 @@
-/dash.elc
-/dash-functional.elc
+*.elc
 /dash-autoloads.el
 /dash-pkg.el
diff --git a/dev/examples.el b/dev/examples.el
index 22ea314..08961bb 100644
--- a/dev/examples.el
+++ b/dev/examples.el
@@ -1,6 +1,6 @@
 ;;; examples.el --- Examples/tests for dash.el's API  -*- lexical-binding: t -*-
 
-;; Copyright (C) 2015 Free Software Foundation, Inc.
+;; Copyright (C) 2015, 2017 Free Software Foundation, Inc.
 
 ;; This program is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
@@ -23,6 +23,9 @@
 ;;; Code:
 
 (require 'dash)
+(eval-when-compile
+  (unless (fboundp 'def-example-group)
+    (require 'examples-to-tests "dev/examples-to-tests")))
 
 (defun even? (num) (= 0 (% num 2)))
 (defun square (num) (* num num))

From c287454fa350452d6d3df5920499d8bb9733898a Mon Sep 17 00:00:00 2001
From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Thu, 28 Dec 2017 13:57:42 -0500
Subject: [PATCH 2/2] * dev/examples.el: Also require dash-functional for -cut
 and friends

---
 dev/examples.el | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/dev/examples.el b/dev/examples.el
index 08961bb..1f83414 100644
--- a/dev/examples.el
+++ b/dev/examples.el
@@ -23,6 +23,7 @@
 ;;; Code:
 
 (require 'dash)
+(require 'dash-functional)
 (eval-when-compile
   (unless (fboundp 'def-example-group)
     (require 'examples-to-tests "dev/examples-to-tests")))
@@ -39,8 +40,8 @@
 (defun approx-equal (u v)
   (or (= u v)
       (< (/ (abs (- u v))
-        (max (abs u) (abs v)))
-     dash--epsilon)))
+            (max (abs u) (abs v)))
+         dash--epsilon)))
 
 (def-example-group "Maps"
   "Functions in this category take a transforming function, which