From 394ec538a1afdd8d695b4aeb3b44e87147285006 Mon Sep 17 00:00:00 2001
From: Doug Coleman <doug.coleman@gmail.com>
Date: Fri, 20 Feb 2009 12:15:26 -0600
Subject: [PATCH] make emacsw32 work on windows out of the box

---
 basis/editors/emacs/emacs.factor           | 13 +++++++++----
 basis/editors/emacs/windows/authors.txt    |  1 +
 basis/editors/emacs/windows/windows.factor |  9 +++++++++
 3 files changed, 19 insertions(+), 4 deletions(-)
 create mode 100755 basis/editors/emacs/windows/authors.txt
 create mode 100755 basis/editors/emacs/windows/windows.factor

diff --git a/basis/editors/emacs/emacs.factor b/basis/editors/emacs/emacs.factor
index 79387f9820..fa78c1b429 100644
--- a/basis/editors/emacs/emacs.factor
+++ b/basis/editors/emacs/emacs.factor
@@ -1,12 +1,18 @@
 USING: definitions io.launcher kernel parser words sequences math
-math.parser namespaces editors make system ;
+math.parser namespaces editors make system combinators.short-circuit ;
 IN: editors.emacs
 
+SYMBOL: emacsclient-path
+
+HOOK: default-emacsclient os ( -- path )
+
+M: object default-emacsclient ( -- path ) "emacsclient" ;
+
 : emacsclient ( file line -- )
     [
-        \ emacsclient get "emacsclient" or ,
+        { [ \ emacsclient-path get ] [ default-emacsclient ] } 0|| ,
         os windows? [ "--no-wait" , ] unless
-        "+" swap number>string append ,
+        number>string "+" prepend ,
         ,
     ] { } make try-process ;
 
@@ -14,4 +20,3 @@ IN: editors.emacs
     where first2 emacsclient ;
 
 [ emacsclient ] edit-hook set-global
-
diff --git a/basis/editors/emacs/windows/authors.txt b/basis/editors/emacs/windows/authors.txt
new file mode 100755
index 0000000000..7c1b2f2279
--- /dev/null
+++ b/basis/editors/emacs/windows/authors.txt
@@ -0,0 +1 @@
+Doug Coleman
diff --git a/basis/editors/emacs/windows/windows.factor b/basis/editors/emacs/windows/windows.factor
new file mode 100755
index 0000000000..d5c1e7811c
--- /dev/null
+++ b/basis/editors/emacs/windows/windows.factor
@@ -0,0 +1,9 @@
+! Copyright (C) 2009 Doug Coleman.
+! See http://factorcode.org/license.txt for BSD license.
+USING: editors.emacs io.directories.search.windows kernel sequences
+system ;
+IN: editors.emacs.windows
+
+M: windows default-emacsclient
+    "Emacs" t [ "emacsclient.exe" tail? ] find-in-program-files
+    "emacsclient.exe" or ;