patch 7.4.1897

Problem:    Various typos, long lines and style mistakes.
Solution:   Fix the typos, wrap lines, improve style.

diff --git a/src/INSTALL b/src/INSTALL
index 521d058be4995ec6347246b777d9bc61ea9c4689..a827fa1bd978b36dfaa4be6aff276f03334efe61 100644 (file)
--- a/src/INSTALL
+++ b/src/INSTALL
@@ -11,7 +11,7 @@ Contents:
 
 See INSTALLami.txt              for Amiga
 See INSTALLmac.txt              for Macintosh
-See INSTALLpc.txt               for PC (MS-DOS, Windows 95/98/NT/XP)
+See INSTALLpc.txt               for PC (Windows 95/98/NT/XP/Vista/7/8/10)
 See INSTALLvms.txt              for VMS
 See INSTALLx.txt               for cross-compiling on Unix
 See ../README_390.txt           for OS/390 Unix

diff --git a/src/buffer.c b/src/buffer.c
index 0bbb1f467a5a45ab3ec01dbea089eff47d1d7b3c..ee28bc9becf42d8279dafc464177c8afb5464b93 100644 (file)
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -2516,7 +2516,7 @@ buflist_findnr(int nr)
        nr = curwin->w_alt_fnum;
     for (buf = firstbuf; buf != NULL; buf = buf->b_next)
        if (buf->b_fnum == nr)
-           return (buf);
+           return buf;
     return NULL;
 }
 

diff --git a/src/config.aap.in b/src/config.aap.in
index 819276feeac61799d6c3beebdfe76b0a2d43a7dc..eebd036980600e395f2088bf1ade6774d5ae33ae 100644 (file)
--- a/src/config.aap.in
+++ b/src/config.aap.in
@@ -75,9 +75,6 @@ RUBY_PRO      = @RUBY_PRO@
 RUBY_CFLAGS    = @RUBY_CFLAGS@
 RUBY_LIBS      = @RUBY_LIBS@
 
-SNIFF_SRC      = @SNIFF_SRC@
-SNIFF_OBJ      = @SNIFF_OBJ@
-
 AWK            = @AWK@
 
 STRIP          = @STRIP@

diff --git a/src/ex_docmd.c b/src/ex_docmd.c
index e5de379858e529902fb871d89fbb3399792054dc..368c2e9853c894ddff8e316c2d75580be434b6ff 100644 (file)
--- a/src/ex_docmd.c
+++ b/src/ex_docmd.c
@@ -2139,7 +2139,8 @@ do_one_cmd(
 #endif
        }
        ea.cmd = skipwhite(ea.cmd);
-       lnum = get_address(&ea, &ea.cmd, ea.addr_type, ea.skip, ea.addr_count == 0);
+       lnum = get_address(&ea, &ea.cmd, ea.addr_type, ea.skip,
+                                                         ea.addr_count == 0);
        if (ea.cmd == NULL)                 /* error detected */
            goto doend;
        if (lnum == MAXLNUM)

diff --git a/src/getchar.c b/src/getchar.c
index 56de09470a92863c3094636e4998ab5fdd7c0c80..03c75869e1e55a67f7979f13c13e15cbcde57e3f 100644 (file)
--- a/src/getchar.c
+++ b/src/getchar.c
@@ -79,7 +79,7 @@ static mapblock_T     *first_abbr = NULL; /* first entry in abbrlist */
 static int             KeyNoremap = 0;     /* remapping flags */
 
 /*
- * variables used by vgetorpeek() and flush_buffers()
+ * Variables used by vgetorpeek() and flush_buffers().
  *
  * typebuf.tb_buf[] contains all characters that are not consumed yet.
  * typebuf.tb_buf[typebuf.tb_off] is the first valid character.

diff --git a/src/if_mzsch.c b/src/if_mzsch.c
index 37cebc553a48c3338071ce369cdefe1d0253d768..51b0352afb1f2eb38cf9d1d78d068b8a45e26221 100644 (file)
--- a/src/if_mzsch.c
+++ b/src/if_mzsch.c
@@ -2725,7 +2725,8 @@ set_buffer_line_list(void *data, int argc, Scheme_Object **argv)
         * Adjust marks. Invalidate any which lie in the
         * changed range, and move any in the remainder of the buffer.
         */
-       mark_adjust((linenr_T)lo, (linenr_T)(hi - 1), (long)MAXLNUM, (long)extra);
+       mark_adjust((linenr_T)lo, (linenr_T)(hi - 1),
+                                                 (long)MAXLNUM, (long)extra);
        changed_lines((linenr_T)lo, 0, (linenr_T)hi, (long)extra);
 
        if (buf->buf == curwin->w_buffer)

diff --git a/src/main.aap b/src/main.aap
index 3c91d39fbeeef7d4adec66d43084ccd2d7d0c1b3..452cd978bec0103de69deaff9bb060333332dddd 100644 (file)
--- a/src/main.aap
+++ b/src/main.aap
@@ -347,7 +347,6 @@ Source =
         $PYTHON_SRC
         $TCL_SRC
         $RUBY_SRC
-        $SNIFF_SRC
         $WORKSHOP_SRC
 
 Objects =

diff --git a/src/option.c b/src/option.c
index d048cecd305099c84a5f99a56181bc67e4de5f5a..b17fc2822bed165c7390430d4bf06f60dff9ea96 100644 (file)
--- a/src/option.c
+++ b/src/option.c
@@ -1665,7 +1665,7 @@ static struct vimoption options[] =
     {"keywordprg",  "kp",   P_STRING|P_EXPAND|P_VI_DEF|P_SECURE,
                            (char_u *)&p_kp, PV_KP,
                            {
-#if defined(MSWIN)
+#ifdef MSWIN
                            (char_u *)":help",
 #else
 # ifdef VMS

diff --git a/src/testdir/README.txt b/src/testdir/README.txt
index 052ccf5a2a24c6b7bd192d41043b803c92f07f34..534f05fd5333a6913a01eb0c7b20f16b8e882d90 100644 (file)
--- a/src/testdir/README.txt
+++ b/src/testdir/README.txt
@@ -5,7 +5,7 @@ want to separate it from other tests with comment lines.
 
 The numbered tests are older, we have switched to named tests.
 
-And then you can chose between a new style test, which is a Vim script, or an
+And then you can choose between a new style test, which is a Vim script, or an
 old style test, which uses Normal mode commands.  Use a new style test if you
 can.
 
@@ -21,13 +21,14 @@ TO ADD A NEW STYLE TEST:
 What you can use (see test_assert.vim for an example):
 - Call assert_equal(), assert_true() and assert_false().
 - Use try/catch to check for exceptions.
-- Use alloc_fail() to have memory allocation fail. This makes it possible to
+- Use alloc_fail() to have memory allocation fail. This makes it possible
   to check memory allocation failures are handled gracefully.  You need to
   change the source code to add an ID to the allocation.  Update LAST_ID_USED
   above alloc_id() to the highest ID used.
 - Use disable_char_avail_for_testing(1) if char_avail() must return FALSE for
   a while.  E.g. to trigger the CursorMovedI autocommand event.
   See test_cursor_func.vim for an example
+- See the start of runtest.vim for more help.
 
 
 TO ADD AN OLD STYLE TEST:

diff --git a/src/testdir/test_reltime.vim b/src/testdir/test_reltime.vim
index 2ef2fbba231d35403f2b90f4a139359ba9fcc12c..adabf16c1e8a88302ab804d17a5130909e9bd64f 100644 (file)
--- a/src/testdir/test_reltime.vim
+++ b/src/testdir/test_reltime.vim
@@ -23,5 +23,4 @@ func Test_reltime()
   call assert_true(reltimestr(differs) != '0.0')
   call assert_true(reltimefloat(differs) < 0.1)
   call assert_true(reltimefloat(differs) > 0.0)
-
 endfunc

diff --git a/src/testdir/test_tagjump.vim b/src/testdir/test_tagjump.vim
index d8a333f44c017b92a0ab2be76aca2d658773f8a1..97d86e6ecba56510985e7b210d36cbe309dbbb69 100644 (file)
--- a/src/testdir/test_tagjump.vim
+++ b/src/testdir/test_tagjump.vim
@@ -6,4 +6,5 @@ func Test_ptag_with_notagstack()
   call assert_fails('ptag does_not_exist_tag_name', 'E426')
   set tagstack&vim
 endfunc
+
 " vim: sw=2 et

diff --git a/src/version.c b/src/version.c
index c6ebdc45b9075512db1c359f6829725958fdc7d9..6e8b0c70a625a930d46173de9c5b23400898261b 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -753,6 +753,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1897,
 /**/
     1896,
 /**/