[nvim] collapse the set and setlocal commands because the Vimscript syntax allows it

nvim/after/ftplugin/haskell.vim

@@ -1,3 +1 @@
-let g:haskall_test = 1
+setlocal foldmethod< foldtext<
-setlocal foldmethod<
-setlocal foldtext<

nvim/after/syntax/cabal.vim

@@ -1,2 +1 @@
-setlocal foldmethod<
+setlocal foldmethod< foldtext<
-setlocal foldtext<

nvim/after/syntax/cabalconfig.vim

@@ -1,2 +1 @@
-setlocal foldmethod<
+setlocal foldmethod< foldtext<
-setlocal foldtext<

nvim/after/syntax/nginx.vim

@@ -4,5 +4,4 @@
 " sourced in `syntax/nginx.vim` in vim-polyglot, which resets the `commentstring`
 " set in `ftplugin/nginx.vim` and sets `comments` to some garbage. This script
 " undoes that damage.
-setlocal comments<
+setlocal comments< commentstring=#%s
-setlocal commentstring=#%s

nvim/plugin/editing.vim

@@ -58,23 +58,17 @@ set commentstring=//%s
 
 
 " Cursor and Scrolling {{{
-
+  set number relativenumber cursorline
-  set number
-  set relativenumber
-  set cursorline
-
   " remember cursor position
   augroup vimrc-editing-remember-cursor-position
     autocmd!
     autocmd BufReadPost * if line("'\"") > 1 && line("'\"") <= line("$") | exec "normal! g`\"" | endif
   augroup END
-
 " }}}
 
 
 " Wrapping {{{
-  set nowrap
+  set nowrap colorcolumn=81,101,121
-  set colorcolumn=81,101,121
 " }}}