fix(cmd_line): Renamed --multiGrid to --multigrid (#862)

BREAKING CHANGE: Renamed --multiGrid to --multigrid
BREAKING CHANGE: Removed env var NeovideMultiGrid

README.md

@@ -32,7 +32,7 @@ Cursor animates into position with a smear effect to improve tracking of cursor
 
 Scroll operations on buffers in neovim will be animated smoothly pixel wise rather than line by line at a time. Note, multigrid must be
 enabled for this to work.
-https://github.com/Kethku/neovide/wiki/Configuration#multiGrid
+https://github.com/Kethku/neovide/wiki/Configuration#multigrid
 
 ![Smooth Scrolling](./assets/SmoothScrolling.gif)
 
@@ -40,7 +40,7 @@ https://github.com/Kethku/neovide/wiki/Configuration#multiGrid
 
 Windows animate into position when they are moved making it easier to see how layout changes happen. Note, multigrid must be enabled for
 this to work.
-https://github.com/Kethku/neovide/wiki/Configuration#multiGrid
+https://github.com/Kethku/neovide/wiki/Configuration#multigrid
 
 ![Animated Windows](./assets/AnimatedWindows.gif)
 
@@ -48,7 +48,7 @@ https://github.com/Kethku/neovide/wiki/Configuration#multiGrid
 
 The backgrounds of floating windows are blurred improving the visual separation between foreground and background from
 built in window transparency. Note, multigrid must be enabled for this to work.
-https://github.com/Kethku/neovide/wiki/Configuration#multiGrid
+https://github.com/Kethku/neovide/wiki/Configuration#multigrid
 
 ![Blurred Floating Windows](./assets/BlurredFloatingWindows.png)
 

src/cmd_line.rs

@@ -70,9 +70,7 @@ pub fn handle_command_line_arguments() -> Result<(), String> {
         )
         .arg(
             Arg::with_name("multi_grid")
-                //.long("multi-grid") TODO: multiGrid is the current way to call this, but I
+                .long("multigrid")
-                //personally would prefer sticking to a unix-y way of naming things...
-                .long("multiGrid")
                 .help("Enable Multigrid"),
         )
         .arg(
@@ -127,7 +125,7 @@ pub fn handle_command_line_arguments() -> Result<(), String> {
      * Integrate Environment Variables as Defaults to the command-line ones.
      *
      * NEOVIM_BIN
-     * NeovideMultiGrid || --multiGrid
+     * NEOVIDE_MULTIGRID || --multigrid
      */
     SETTINGS.set::<CmdLineSettings>(&CmdLineSettings {
         neovim_bin: std::env::var("NEOVIM_BIN").ok(),
@@ -142,9 +140,7 @@ pub fn handle_command_line_arguments() -> Result<(), String> {
             .map(|opt| opt.map(|v| v.to_owned()).collect())
             .unwrap_or_default(),
         maximized: matches.is_present("maximized") || std::env::var("NEOVIDE_MAXIMIZED").is_ok(),
-        multi_grid: std::env::var("NEOVIDE_MULTIGRID").is_ok()
+        multi_grid: std::env::var("NEOVIDE_MULTIGRID").is_ok() || matches.is_present("multi_grid"),
-            || std::env::var("NeovideMultiGrid").is_ok()
-            || matches.is_present("multi_grid"),
         remote_tcp: matches.value_of("remote_tcp").map(|i| i.to_owned()),
         nofork: matches.is_present("nofork") || matches.is_present("verbosity"),
         wsl: matches.is_present("wsl"),