Fix conflict

extra/editors/gvim/gvim.factor

@@ -5,8 +5,10 @@ TUPLE: gvim ;
 
 M: gvim vim-command ( file line -- string )
     [
-        "\"" % vim-path get % "\" --remote-tab-silent " %
+        "\"" % vim-path get % "\"" %
+        vim-switches get [ % ] when*
         "+" % # " \"" % % "\"" %
     ] "" make ;
 
 T{ gvim } vim-editor set-global
+"gvim" vim-path set-global

extra/http/server/templating/templating.factor

@@ -1,8 +1,8 @@
 ! Copyright (C) 2005 Alex Chapman
 ! Copyright (C) 2006, 2007 Slava Pestov
 ! See http://factorcode.org/license.txt for BSD license.
-USING: sequences kernel parser namespaces io io.files
+USING: continuations sequences kernel parser namespaces io
-io.streams.lines io.streams.string html html.elements
+io.files io.streams.lines io.streams.string html html.elements
 source-files debugger combinators math quotations generic
 strings splitting ;
 
@@ -70,6 +70,9 @@ DEFER: <% delimiter
 
 : eval-template ( string -- ) parse-template call ;
 
+: html-error. ( error -- )
+    <pre> error. </pre> ;
+
 : run-template-file ( filename -- )
     [
         [
@@ -79,7 +82,7 @@ DEFER: <% delimiter
             dup source-file file set ! so that reload works properly
             [
                 ?resource-path <file-reader> contents
-                eval-template
+                [ eval-template ] [ html-error. drop ] recover
             ] keep
         ] with-scope
     ] assert-depth drop ;