Fix linter errors.

2 files changed, 77 insertions, 75 deletions

diff --git a/src/nvim/buffer_defs.h b/src/nvim/buffer_defs.h
index 9b2b6bb78f..20a7661880 100644
--- a/src/nvim/buffer_defs.h
+++ b/src/nvim/buffer_defs.h
@@ -592,72 +592,72 @@ struct file_buffer {
 
   int b_p_scriptID[BV_COUNT];           /* SIDs for buffer-local options */
 
-  int b_p_ai;                   /* 'autoindent' */
-  int b_p_ai_nopaste;           /* b_p_ai saved for paste mode */
-  char_u      *b_p_bkc;         ///< 'backupcopy'
-  unsigned int b_bkc_flags;     ///< flags for 'backupcopy'
-  int b_p_ci;                   /* 'copyindent' */
-  int b_p_bin;                  /* 'binary' */
-  int b_p_bomb;                 /* 'bomb' */
-  char_u      *b_p_bh;          /* 'bufhidden' */
-  char_u      *b_p_bt;          /* 'buftype' */
-  int b_p_bl;                   /* 'buflisted' */
-  int b_p_cin;                  /* 'cindent' */
-  char_u      *b_p_cino;        /* 'cinoptions' */
-  char_u      *b_p_cink;        /* 'cinkeys' */
-  char_u      *b_p_cinw;        /* 'cinwords' */
-  char_u      *b_p_com;         /* 'comments' */
-  char_u      *b_p_cms;         /* 'commentstring' */
-  char_u      *b_p_cpt;         /* 'complete' */
-  char_u      *b_p_cfu;         /* 'completefunc' */
-  char_u      *b_p_ofu;         /* 'omnifunc' */
-  int b_p_eol;                  /* 'endofline' */
-  int b_p_fixeol;               /* 'fixendofline' */
-  int b_p_et;                   /* 'expandtab' */
-  int b_p_et_nobin;             /* b_p_et saved for binary mode */
-  int b_p_et_nopaste;           // b_p_et saved for paste mode
-  char_u      *b_p_fenc;        /* 'fileencoding' */
-  char_u      *b_p_ff;          /* 'fileformat' */
-  char_u      *b_p_ft;          /* 'filetype' */
-  char_u      *b_p_fo;          /* 'formatoptions' */
-  char_u      *b_p_flp;         /* 'formatlistpat' */
-  int b_p_inf;                  /* 'infercase' */
-  char_u      *b_p_isk;         /* 'iskeyword' */
-  char_u      *b_p_def;         /* 'define' local value */
-  char_u      *b_p_inc;         /* 'include' */
-  char_u      *b_p_inex;        /* 'includeexpr' */
-  uint32_t b_p_inex_flags;      /* flags for 'includeexpr' */
-  char_u      *b_p_inde;        /* 'indentexpr' */
-  uint32_t b_p_inde_flags;        /* flags for 'indentexpr' */
-  char_u      *b_p_indk;        /* 'indentkeys' */
-  char_u      *b_p_fex;         /* 'formatexpr' */
-  uint32_t b_p_fex_flags;       /* flags for 'formatexpr' */
-  char_u      *b_p_kp;          /* 'keywordprg' */
-  int b_p_lisp;                 /* 'lisp' */
-  char_u      *b_p_mps;         /* 'matchpairs' */
-  int b_p_ml;                   /* 'modeline' */
-  int b_p_ml_nobin;             /* b_p_ml saved for binary mode */
-  int b_p_ma;                   /* 'modifiable' */
-  char_u      *b_p_nf;          /* 'nrformats' */
-  int b_p_pi;                   /* 'preserveindent' */
-  char_u      *b_p_qe;          /* 'quoteescape' */
-  int b_p_ro;                   /* 'readonly' */
-  long b_p_sw;                  /* 'shiftwidth' */
-  int b_p_si;                   /* 'smartindent' */
-  long b_p_sts;                 /* 'softtabstop' */
-  long b_p_sts_nopaste;         /* b_p_sts saved for paste mode */
-  char_u      *b_p_sua;         /* 'suffixesadd' */
-  bool b_p_swf;                 /* 'swapfile' */
-  long b_p_smc;                 /* 'synmaxcol' */
-  char_u      *b_p_syn;         /* 'syntax' */
-  long b_p_ts;                  /* 'tabstop' */
-  long b_p_tw;                  /* 'textwidth' */
-  long b_p_tw_nobin;            /* b_p_tw saved for binary mode */
-  long b_p_tw_nopaste;          /* b_p_tw saved for paste mode */
-  long b_p_wm;                  /* 'wrapmargin' */
-  long b_p_wm_nobin;            /* b_p_wm saved for binary mode */
-  long b_p_wm_nopaste;          /* b_p_wm saved for paste mode */
-  char_u      *b_p_keymap;      /* 'keymap' */
+  int b_p_ai;                   ///< 'autoindent'
+  int b_p_ai_nopaste;           ///< b_p_ai saved for paste mode
+  char_u      *b_p_bkc;         ///< 'backupco
+  unsigned int b_bkc_flags;     ///< flags for 'backupco
+  int b_p_ci;                   ///< 'copyindent'
+  int b_p_bin;                  ///< 'binary'
+  int b_p_bomb;                 ///< 'bomb'
+  char_u      *b_p_bh;          ///< 'bufhidden'
+  char_u      *b_p_bt;          ///< 'buftype'
+  int b_p_bl;                   ///< 'buflisted'
+  int b_p_cin;                  ///< 'cindent'
+  char_u      *b_p_cino;        ///< 'cinoptions'
+  char_u      *b_p_cink;        ///< 'cinkeys'
+  char_u      *b_p_cinw;        ///< 'cinwords'
+  char_u      *b_p_com;         ///< 'comments'
+  char_u      *b_p_cms;         ///< 'commentstring'
+  char_u      *b_p_cpt;         ///< 'complete'
+  char_u      *b_p_cfu;         ///< 'completefunc'
+  char_u      *b_p_ofu;         ///< 'omnifunc'
+  int b_p_eol;                  ///< 'endofline'
+  int b_p_fixeol;               ///< 'fixendofline'
+  int b_p_et;                   ///< 'expandtab'
+  int b_p_et_nobin;             ///< b_p_et saved for binary mode
+  int b_p_et_nopaste;           ///< b_p_et saved for paste mode
+  char_u      *b_p_fenc;        ///< 'fileencoding'
+  char_u      *b_p_ff;          ///< 'fileformat'
+  char_u      *b_p_ft;          ///< 'filetype'
+  char_u      *b_p_fo;          ///< 'formatoptions'
+  char_u      *b_p_flp;         ///< 'formatlistpat'
+  int b_p_inf;                  ///< 'infercase'
+  char_u      *b_p_isk;         ///< 'iskeyword'
+  char_u      *b_p_def;         ///< 'define' local value
+  char_u      *b_p_inc;         ///< 'include'
+  char_u      *b_p_inex;        ///< 'includeexpr'
+  uint32_t b_p_inex_flags;      ///< flags for 'includeexpr'
+  char_u      *b_p_inde;        ///< 'indentexpr'
+  uint32_t b_p_inde_flags;      ///< flags for 'indentexpr'
+  char_u      *b_p_indk;        ///< 'indentkeys'
+  char_u      *b_p_fex;         ///< 'formatexpr'
+  uint32_t b_p_fex_flags;       ///< flags for 'formatexpr'
+  char_u      *b_p_kp;          ///< 'keywordprg'
+  int b_p_lisp;                 ///< 'lisp'
+  char_u      *b_p_mps;         ///< 'matchpairs'
+  int b_p_ml;                   ///< 'modeline'
+  int b_p_ml_nobin;             ///< b_p_ml saved for binary mode
+  int b_p_ma;                   ///< 'modifiable'
+  char_u      *b_p_nf;          ///< 'nrformats'
+  int b_p_pi;                   ///< 'preserveindent'
+  char_u      *b_p_qe;          ///< 'quoteescape'
+  int b_p_ro;                   ///< 'readonly'
+  long b_p_sw;                  ///< 'shiftwidth'
+  int b_p_si;                   ///< 'smartindent'
+  long b_p_sts;                 ///< 'softtabstop'
+  long b_p_sts_nopaste;         ///< b_p_sts saved for paste mode
+  char_u      *b_p_sua;         ///< 'suffixesadd'
+  bool b_p_swf;                 ///< 'swapfile'
+  long b_p_smc;                 ///< 'synmaxcol'
+  char_u      *b_p_syn;         ///< 'syntax'
+  long b_p_ts;                  ///< 'tabstop'
+  long b_p_tw;                  ///< 'textwidth'
+  long b_p_tw_nobin;            ///< b_p_tw saved for binary mode
+  long b_p_tw_nopaste;          ///< b_p_tw saved for paste mode
+  long b_p_wm;                  ///< 'wrapmargin'
+  long b_p_wm_nobin;            ///< b_p_wm saved for binary mode
+  long b_p_wm_nopaste;          ///< b_p_wm saved for paste mode
+  char_u      *b_p_keymap;      ///< 'keymap'
 
   /* local values for options which are normally global */
   char_u      *b_p_gp;          /* 'grepprg' local value */
diff --git a/src/nvim/option.c b/src/nvim/option.c
index c318dbfbfd..db8f0ff603 100644
--- a/src/nvim/option.c
+++ b/src/nvim/option.c
@@ -6203,15 +6203,16 @@ static void paste_option_changed(void)
       buf->b_p_et = 0;              // no expandtab
     }
 
-    /* set global options */
+    // set global options
     p_sm = 0;                       // no showmatch
     p_sta = 0;                      // no smarttab
-    if (p_ru)
-      status_redraw_all();          /* redraw to remove the ruler */
-    p_ru = 0;                       /* no ruler */
-    p_ri = 0;                       /* no reverse insert */
-    p_hkmap = 0;                    /* no Hebrew keyboard */
-    /* set global values for local buffer options */
+    if (p_ru) {
+      status_redraw_all();          // redraw to remove the ruler
+    }
+    p_ru = 0;                       // no ruler
+    p_ri = 0;                       // no reverse insert
+    p_hkmap = 0;                    // no Hebrew keyboard
+    // set global values for local buffer options
     p_tw = 0;
     p_wm = 0;
     p_sts = 0;
@@ -6233,8 +6234,9 @@ static void paste_option_changed(void)
     /* restore global options */
     p_sm = save_sm;
     p_sta = save_sta;
-    if (p_ru != save_ru)
-      status_redraw_all();          /* redraw to draw the ruler */
+    if (p_ru != save_ru) {
+      status_redraw_all();          // redraw to draw the ruler
+    }
     p_ru = save_ru;
     p_ri = save_ri;
     p_hkmap = save_hkmap;