diff --git a/editor/emacs/aliases.zsh b/editor/emacs/aliases.zsh
index e69de29b..f49442b4 100644
--- a/editor/emacs/aliases.zsh
+++ b/editor/emacs/aliases.zsh
@@ -0,0 +1,16 @@
+if is-callable emacs; then
+    if [[ "$OSTYPE" == darwin* ]]; then
+        alias emacs='emacs -nw'
+        e() { # Emacs version of v
+            if pgrep Emacs 2>&1 >/dev/null; then
+                emacsclient -n $@
+            else
+                /Applications/Emacs.app/Contents/MacOS/Emacs $@ &
+            fi
+        }
+    else
+        alias e='emacsclient -n'
+    fi
+
+    ediff() { e --eval "(ediff-files \"$1\" \"$2\")"; }
+fi