Reformat

[factor.git] / basis / editors / emacs / emacs.factor

diff --git a/basis/editors/emacs/emacs.factor b/basis/editors/emacs/emacs.factor
index ec1e08fb5b3db05aab16221c6099d463292fe7be..803b7ce9eb1df7cf5bbe5b2acbd9c2dd9d4a8b5b 100644 (file)
--- a/basis/editors/emacs/emacs.factor
+++ b/basis/editors/emacs/emacs.factor
@@ -1,9 +1,8 @@
 USING: combinators.short-circuit editors io.standard-paths
-kernel make math.parser namespaces sequences system ;
+kernel make math.parser namespaces sequences system vocabs ;
 IN: editors.emacs
 
-SINGLETON: emacsclient
-emacsclient editor-class set-global
+SINGLETON: emacs
 
 SYMBOL: emacsclient-path
 SYMBOL: emacsclient-args
@@ -13,17 +12,12 @@ HOOK: find-emacsclient os ( -- path )
 M: object find-emacsclient
     "emacsclient" ?find-in-path ;
 
-M: windows find-emacsclient
-    {
-        [ { "Emacs" } "emacsclientw.exe" find-in-applications ]
-        [ { "Emacs" } "emacsclient.exe" find-in-applications ]
-        [ "emacsclient.exe" ]
-    } 0|| ;
-
-M: emacsclient editor-command
+M: emacs editor-command
     [
         emacsclient-path get [ find-emacsclient ] unless* ,
         emacsclient-args get [ { "-a=emacs" "--no-wait" } ] unless* %
         number>string "+" prepend ,
         ,
     ] { } make ;
+
+os windows? [ "editors.emacs.windows" require ] when
\ No newline at end of file