Merge branch 'master' of https://github.com/yatli/fvim

yatli · Oct 30, 2020 · 03f1cd7 · 03f1cd7
2 parents 88fd758 + d01a200
commit 03f1cd7
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/getopt.fs b/getopt.fs
@@ -26,6 +26,7 @@ type Options =
         stderrenc: System.Text.Encoding
         serveropts: ServerOptions
         debugMultigrid: bool
+        norc: bool
     }
 
 let parseOptions (args: string[]) =
@@ -119,6 +120,11 @@ let parseOptions (args: string[]) =
             | [| ParseIp ipaddr; ParseUInt16 port |] -> Tcp(IPEndPoint(ipaddr, int port))
             | _ -> NamedPipe connect.Value
 
+    let norc = 
+        args 
+        |> List.pairwise
+        |> List.exists( (=) ("-u", "NORC") )
+
     { 
         logToStdout     = trace_to_stdout
         logToFile       = trace_to_file
@@ -129,5 +135,6 @@ let parseOptions (args: string[]) =
         stderrenc       = enc
         intent          = intent
         debugMultigrid  = debug_multigrid
+        norc            = norc
     }
 
diff --git a/model.fs b/model.fs
@@ -649,8 +649,9 @@ let Start (opts: getopt.Options) =
 
 
         // trigger ginit upon VimEnter
-        let! _ = Async.AwaitTask(nvim.command "autocmd VimEnter * runtime! ginit.vim")
-        ()
+        if not opts.norc then
+          let! _ = Async.AwaitTask(nvim.command "autocmd VimEnter * runtime! ginit.vim")
+          ()
     } |> Async.RunSynchronously
 
 let Flush =