diff --git a/dotfiles/cider/bootstrap.json b/dotfiles/cider/bootstrap.json
index 77341e64..7e7f7efd 100644
--- a/dotfiles/cider/bootstrap.json
+++ b/dotfiles/cider/bootstrap.json
@@ -1,135 +1,137 @@
 {
-    "casks": [
-        "atom",
-        "alfred",
-        "caffeine",
-        "firefox",
-        "flux",
-        "google-chrome",
-        "iterm2",
-        "java",
-        "karabiner",
-        "macpass",
-        "seil",
-        "slate",
-        "spotify",
-        "sublime-text",
-        "synergy",
-        "transmission",
-        "virtualbox",
-        "vlc",
-        "xquartz"
-    ],
-    "formulas": [
-        "ack",
-        "ant",
-        "at-spi2-atk",
-        "at-spi2-core",
-        "atk",
-        "autoconf",
-        "automake",
-        "bash",
-        "binutils",
-        "brew-cask",
-        "cairo",
-        "cmake",
-        "coreutils",
-        "ctags",
-        "d-bus",
-        "daemonize",
-        "diffutils",
-        "ed",
-        "emacs",
-        "file-formula",
-        "findutils",
-        "fontconfig",
-        "fontforge",
-        "freetype",
-        "gawk",
-        "gdbm",
-        "gdk-pixbuf",
-        "gettext",
-        "gist",
-        "git",
-        "giter8",
-        "glib",
-        "glib-networking",
-        "gmp",
-        "gnome-icon-theme",
-        "gnu-indent",
-        "gnu-sed",
-        "gnu-tar",
-        "gnu-which",
-        "gnutls",
-        "go",
-        "gobject-introspection",
-        "grep",
-        "gsettings-desktop-schemas",
-        "gssdp",
-        "gtk+3",
-        "gupnp",
-        "gupnp-av",
-        "gupnp-tools",
-        "gzip",
-        "harfbuzz",
-        "heroku-toolbelt",
-        "htop-osx",
-        "hub",
-        "icu4c",
-        "intltool",
-        "jpeg",
-        "less",
-        "libevent",
-        "libffi",
-        "libidn",
-        "libpng",
-        "libsoup",
-        "libtasn1",
-        "libtiff",
-        "libtool",
-        "lzip",
-        "make",
-        "mercurial",
-        "netcat",
-        "nettle",
-        "ngrep",
-        "nmap",
-        "node",
-        "openssh",
-        "openssl",
-        "ossp-uuid",
-        "pandoc",
-        "pango",
-        "pcre",
-        "pixman",
-        "pkg-config",
-        "portmidi",
-        "pstree",
-        "pv",
-        "pypy",
-        "python",
-        "python3",
-        "readline",
-        "reattach-to-user-namespace",
-        "rsync",
-        "sbt",
-        "scala",
-        "sdl",
-        "sdl_image",
-        "sdl_mixer",
-        "sdl_ttf",
-        "sleuthkit",
-        "sqlite",
-        "subversion",
-        "tig",
-        "tmux",
-        "unzip",
-        "vim",
-        "watch",
-        "wdiff",
-        "webp",
-        "wget",
-        "xz",
-        "zsh"
-    ]
+  "casks": [
+    "atom",
+    "alfred",
+    "caffeine",
+    "firefox",
+    "flux",
+    "google-chrome",
+    "iterm2",
+    "java",
+    "karabiner",
+    "macpass",
+    "seil",
+    "slate",
+    "spotify",
+    "sublime-text",
+    "synergy",
+    "transmission",
+    "virtualbox",
+    "vlc",
+    "xquartz"
+  ],
+  "formulas": [
+    "ack",
+    "ant",
+    "at-spi2-atk",
+    "at-spi2-core",
+    "atk",
+    "autoconf",
+    "automake",
+    "bash",
+    "binutils",
+    "brew-cask",
+    "cairo",
+    "cmake",
+    "coreutils",
+    "ctags",
+    "d-bus",
+    "daemonize",
+    "diffutils",
+    "ed",
+    "emacs --cocoa --srgb",
+    "file-formula",
+    "findutils",
+    "fontconfig",
+    "fontforge",
+    "freetype",
+    "gawk",
+    "gdbm",
+    "gdk-pixbuf",
+    "gettext",
+    "gist",
+    "git",
+    "giter8",
+    "glib",
+    "glib-networking",
+    "globals",
+    "gmp",
+    "gnome-icon-theme",
+    "gnu-indent",
+    "gnu-sed",
+    "gnu-tar",
+    "gnu-which",
+    "gnutls",
+    "go",
+    "gobject-introspection",
+    "grep",
+    "gsettings-desktop-schemas",
+    "gssdp",
+    "gtk+3",
+    "gupnp",
+    "gupnp-av",
+    "gupnp-tools",
+    "gzip",
+    "harfbuzz",
+    "heroku-toolbelt",
+    "htop-osx",
+    "hub",
+    "icu4c",
+    "intltool",
+    "jpeg",
+    "less",
+    "libevent",
+    "libffi",
+    "libidn",
+    "libpng",
+    "libsoup",
+    "libtasn1",
+    "libtiff",
+    "libtool",
+    "lzip",
+    "make",
+    "mercurial",
+    "netcat",
+    "nettle",
+    "ngrep",
+    "nmap",
+    "node",
+    "openssh",
+    "openssl",
+    "ossp-uuid",
+    "pandoc",
+    "pango",
+    "pcre",
+    "pixman",
+    "pkg-config",
+    "portmidi",
+    "pstree",
+    "pv",
+    "pypy",
+    "python",
+    "python3",
+    "readline",
+    "reattach-to-user-namespace",
+    "rsync",
+    "sbt",
+    "scala",
+    "sdl",
+    "sdl_image",
+    "sdl_mixer",
+    "sdl_ttf",
+    "sleuthkit",
+    "sqlite",
+    "subversion",
+    "tig",
+    "tmux",
+    "unzip",
+    "vim",
+    "watch",
+    "wdiff",
+    "webp",
+    "weechat",
+    "wget",
+    "xz",
+    "zsh"
+  ]
 }
diff --git a/dotfiles/emacs.d b/dotfiles/emacs.d
index 0bbe0fa7..01a995a4 160000
--- a/dotfiles/emacs.d
+++ b/dotfiles/emacs.d
@@ -1 +1 @@
-Subproject commit 0bbe0fa7a8599540ae515b9abd61c086acd2d49a
+Subproject commit 01a995a455240882ea5b3f6d1df4188c1b50df5e
diff --git a/dotfiles/lib/shellrc/emacs.sh b/dotfiles/lib/shellrc/emacs.sh
index fdfa3a3d..73828e17 100644
--- a/dotfiles/lib/shellrc/emacs.sh
+++ b/dotfiles/lib/shellrc/emacs.sh
@@ -28,3 +28,8 @@ function _current_dot_directory {
     local directory="$(git rev-parse --show-toplevel 2> /dev/null || pwd)"
     _dot_directory $directory
 }
+
+# Make emacs the default editor.
+export EDITOR="emacs -Q"
+export ALTERNATE_EDITOR=""
+export VISUAL="$EDITOR"
diff --git a/dotfiles/lib/shellrc/exports.sh b/dotfiles/lib/shellrc/exports.sh
index 0e23ad55..676a481d 100644
--- a/dotfiles/lib/shellrc/exports.sh
+++ b/dotfiles/lib/shellrc/exports.sh
@@ -3,10 +3,6 @@ if [[ $COLORTERM = gnome-* && $TERM = xterm ]] && infocmp gnome-256color >/dev/n
 elif infocmp xterm-256color >/dev/null 2>&1; then
     export TERM=xterm-256color
 fi
-# Make emacs the default editor.
-export EDITOR="$(which emacsclient) -t"
-export ALTERNATE_EDITOR=""
-export VISUAL="$EDITOR"
 
 # Larger bash history (allow 32³ entries; default is 500)
 export HISTSIZE=32768