IEx now loads the .iex.exs file instead of the .iex one

Author: José Valim

CHANGELOG.md

@@ -23,6 +23,7 @@
 
 * Backwards incompatible changes
   * [Dict] Implementations of `equal?/2` and `merge/2` in `HashDict` and `ListDict` are no longer polymorphic. To get polymorphism, use the functions in `Dict` instead
+  * [IEx] IEx now loads the `.iex.exs` file instead of `.iex`
   * [Kernel] Remove `**` from the list of allowed operators
   * [Kernel] Limit sigils delimiters to one of the following: `<>`, `{}`, `[]`, `()`, `||`, `//`, `"` and `'`
   * [Range] `Range` is no longer a record, instead use `first .. last` if you need pattern matching

bin/iex

@@ -17,7 +17,7 @@ if [ $# -gt 0 ] && ([ "$1" = "--help" ] || [ "$1" = "-h" ]); then
   --hidden          Makes a hidden node
   --detached        Starts the Erlang VM detached from console
   --remsh \"name\"    Connects to a node using a remote shell
-  --dot-iex \"path\"  Overrides default .iex file and uses path instead;
+  --dot-iex \"path\"  Overrides default .iex.exs file and uses path instead;
                     path can be empty, then no file will be loaded
 
 ** Options marked with (*) can be given more than once

lib/elixir/lib/kernel.ex

@@ -377,7 +377,7 @@ defmodule Kernel do
 
   * `:decimals` — number of decimal points to show
   * `:scientific` — number of decimal points to show, in scientific format
-  * `:compact` — If true, use the most compact representation (ignored with the `scientific` option)
+  * `:compact` — when true, use the most compact representation (ignored with the `scientific` option)
 
   ## Examples
 
@@ -397,7 +397,7 @@ defmodule Kernel do
 
   * `:decimals` — number of decimal points to show
   * `:scientific` — number of decimal points to show, in scientific format
-  * `:compact` — If true, use the most compact representation (ignored with the `scientific` option)
+  * `:compact` — when true, use the most compact representation (ignored with the `scientific` option)
 
   ## Examples
 

lib/elixir/test/elixir/string_test.exs

@@ -408,7 +408,7 @@ defmodule StringTest do
     assert String.contains? "elixir of life", "of"
     assert String.contains? "エリクシア", "シ"
     assert String.contains? "elixir of life", ["mercury", "life"]
-    refute String.contains? "exlixir of life", "death"
+    refute String.contains? "elixir of life", "death"
     refute String.contains? "エリクシア", "仙"
     refute String.contains? "elixir of life", ["death", "mercury", "eternal life"]
 

lib/iex/lib/iex.ex

@@ -120,19 +120,19 @@ defmodule IEx do
   Connecting an Elixir shell to a remote node without Elixir is
   **not** supported.
 
-  ## The .iex file
+  ## The .iex.exs file
 
-  When starting IEx, it will look for a local .iex file (located in the current
-  working directory), then a global one (located at ~/.iex) and will load the
+  When starting IEx, it will look for a local `.iex.exs` file (located in the current
+  working directory), then a global one (located at `~/.iex.exs`) and will load the
   first one it finds (if any). The code in the chosen .iex file will be
   evaluated in the shell's context. So, for instance, any modules that are
   loaded or variables that are bound in the .iex file will be available in the
   shell after it has booted.
 
   Sample contents of a local .iex file:
 
-      # source another .iex file
-      import_file "~/.iex"
+      # source another `.iex` file
+      import_file "~/.iex.exs"
 
       # print something before the shell starts
       IO.puts "hello world"
@@ -151,7 +151,7 @@ defmodule IEx do
       iex(1)> value
       13
 
-  It is possible to override the default loading sequence for .iex file by
+  It is possible to override the default loading sequence for `.iex.exs` file by
   supplying the `--dot-iex` option to iex. See `iex --help`.
 
   ## Configuring the shell
@@ -164,7 +164,7 @@ defmodule IEx do
   `IEx.Options.print_help/1` will print documentation for the given option.
 
   In particular, it might be convenient to customize those options inside your
-  .iex file like this:
+  `.iex.exs` file like this:
 
       # .iex
       IEx.Options.set :inspect, limit: 3

lib/iex/lib/iex/evaluator.ex

@@ -45,14 +45,14 @@ defmodule IEx.Evaluator do
   end
 
   @doc """
-  Locates and loads an .iex file from one of predefined locations.
+  Locates and loads an .iex.exs file from one of predefined locations.
   Returns the new config.
   """
   def load_dot_iex(config, path \\ nil) do
     candidates = if path do
       [path]
     else
-      Enum.map [".iex", "~/.iex"], &Path.expand/1
+      Enum.map [".iex.exs", "~/.iex.exs"], &Path.expand/1
     end
 
     path = Enum.find candidates, &File.regular?/1

lib/iex/lib/iex/options.ex

@@ -2,7 +2,7 @@ defmodule IEx.Options do
   @moduledoc """
   Provides an interface for adjusting options of the running IEx session.
 
-  Changing options is usually done inside an IEx session or in your .iex file.
+  Changing options is usually done inside an IEx session or in your .iex.exs file.
   See `h(IEx)` for more info on the latter.
 
   If the value of an option is a keyword list, only those keys that are