From 31afaaeadb114bb73a7252f052d6f8002a9378e5 Mon Sep 17 00:00:00 2001
From: syl20bnr <sylvain.benner@gmail.com>
Date: Sun, 28 Sep 2014 16:31:54 -0400
Subject: [PATCH] Remove required macros.el file in a configuration layer

Now macros should be defined in funcs.el
---
 README.md                  | 4 +---
 contrib/syl20bnr/macros.el | 0
 core/contribsys.el         | 2 +-
 spacemacs/macros.el        | 1 -
 4 files changed, 2 insertions(+), 5 deletions(-)
 delete mode 100644 contrib/syl20bnr/macros.el
 delete mode 100644 spacemacs/macros.el

diff --git a/README.md b/README.md
index 5cd0e7881..d0d040014 100644
--- a/README.md
+++ b/README.md
@@ -160,7 +160,6 @@ Configuration is organized in layers. Each layer has the following structure:
   |__ extensions.el
   |__ funcs.el
   |__ keybindings.el
-  |__ macros.el
   |__ packages.el
 
 [] = directory
@@ -172,9 +171,8 @@ Where:
 ------------------|-----------------------------------------------------------
 config.el         | Emacs built-in configuration or mandatory configuration
 extensions.el     | The list of extensions to load and the functions to initialize them
-funcs.el          | Various functions
+funcs.el          | Various functions and macros (often used in keybindings.el)
 keybindings.el    | Emacs built-in key bindings or mandatory key bindings
-macros.el         | Various macros (may be merged with funcs.el)
 packages.el       | The list of packages to install and the functions to initialize them
 
 `Packages` are `ELPA` packages which can be installed from an `ELPA` compliant
diff --git a/contrib/syl20bnr/macros.el b/contrib/syl20bnr/macros.el
deleted file mode 100644
index e69de29bb..000000000
diff --git a/core/contribsys.el b/core/contribsys.el
index 207b98bd9..cc4d52c7b 100644
--- a/core/contribsys.el
+++ b/core/contribsys.el
@@ -48,7 +48,7 @@ initialize the extension. ")
 
 (defun contribsys/load-layers ()
   "Load all declared layers."
-  (contribsys/load-layer-files '("funcs.el" "macros.el" "config.el"))
+  (contribsys/load-layer-files '("funcs.el" "config.el"))
   (contribsys/read-packages-and-extensions)
   (contribsys/initialize-extensions spacemacs-all-pre-extensions)
   (contribsys/install-packages)
diff --git a/spacemacs/macros.el b/spacemacs/macros.el
deleted file mode 100644
index 9609c6801..000000000
--- a/spacemacs/macros.el
+++ /dev/null
@@ -1 +0,0 @@
-;; nothing here for now