Merge pull request #2379 from jw2013/master

Fix broken promise in Kernel.SpecialForms

Author: José Valim

lib/elixir/lib/kernel/special_forms.ex

@@ -612,6 +612,14 @@ defmodule Kernel.SpecialForms do
   """
   defmacro __DIR__
 
+  @doc """
+  Returns the current calling environment as a `Macro.Env` struct.
+
+  In the environment you can access the filename, line numbers,
+  set up aliases, the function and others.
+  """
+  defmacro __CALLER__
+
   @doc """
   Accesses an already bound variable in match clauses.