From 970266dba6e85cf706b05728060dbd24013725e4 Mon Sep 17 00:00:00 2001
From: Jochen Lillich <jochen@lillich.info>
Date: Tue, 21 Jun 2011 20:30:26 +0200
Subject: [PATCH 1/2] New emacs plugin

---
 plugins/emacs/emacs.plugin.zsh | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 plugins/emacs/emacs.plugin.zsh

diff --git a/plugins/emacs/emacs.plugin.zsh b/plugins/emacs/emacs.plugin.zsh
new file mode 100644
index 000000000..ada12fab7
--- /dev/null
+++ b/plugins/emacs/emacs.plugin.zsh
@@ -0,0 +1,16 @@
+export EMACS_APP="/Applications/Emacs.app"
+
+# open in background, eventually using running app
+export EDITOR="open -a $EMACS_APP"
+
+# always open new app, wait until closed
+export GIT_EDITOR="open -n -W -a $EMACS_APP"
+
+alias em="$EDITOR"
+
+# workaround b/c Emacs can only open already existing files
+function _emacs_touch_and_edit() {
+    touch $*
+    $EDITOR $*
+}
+alias emt=_emacs_touch_and_edit

From 6f7f497c66b7ff7d8b1748084aed12a558c70f1f Mon Sep 17 00:00:00 2001
From: Jochen Lillich <jochen@lillich.info>
Date: Tue, 21 Jun 2011 21:16:47 +0200
Subject: [PATCH 2/2] Fix: Call $EDITOR command with eval

---
 plugins/emacs/emacs.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/emacs/emacs.plugin.zsh b/plugins/emacs/emacs.plugin.zsh
index ada12fab7..608d4ae6c 100644
--- a/plugins/emacs/emacs.plugin.zsh
+++ b/plugins/emacs/emacs.plugin.zsh
@@ -11,6 +11,6 @@ alias em="$EDITOR"
 # workaround b/c Emacs can only open already existing files
 function _emacs_touch_and_edit() {
     touch $*
-    $EDITOR $*
+    eval $EDITOR $*
 }
 alias emt=_emacs_touch_and_edit