updated for version 7.2-234

diff --git a/runtime/doc/cmdline.txt b/runtime/doc/cmdline.txt
index 839536b21f16dabe2f3319bec50cb81fe78653d2..c87e61c08901796355b0bc0fd3cd39cf9fa0734b 100644 (file)
--- a/runtime/doc/cmdline.txt
+++ b/runtime/doc/cmdline.txt
@@ -441,13 +441,20 @@ between files with almost the same name.  If there are multiple matches,
 those files with an extension that is in the 'suffixes' option are ignored.
 The default is ".bak,~,.o,.h,.info,.swp,.obj", which means that files ending
 in ".bak", "~", ".o", ".h", ".info", ".swp" and ".obj" are sometimes ignored.
-It is impossible to ignore suffixes with two dots.  Examples:
+
+An empty entry, two consecutive commas, match a file name that does not
+contain a ".", thus has no suffix.  This is useful to ignore "prog" and prefer
+"prog.c".
+
+Examples:
 
   pattern:     files:                          match:  ~
    test*       test.c test.h test.o            test.c
    test*       test.h test.o                   test.h and test.o
    test*       test.i test.h test.c            test.i and test.c
 
+It is impossible to ignore suffixes with two dots.
+
 If there is more than one matching file (after ignoring the ones matching
 the 'suffixes' option) the first file name is inserted.  You can see that
 there is only one match when you type 'wildchar' twice and the completed

diff --git a/src/misc1.c b/src/misc1.c
index 39669b4c3290009aef7f8e98bcbd77423d3996ab..f86a16781fd23242b13b5f7729dac5e6e07a6f09 100644 (file)
--- a/src/misc1.c
+++ b/src/misc1.c
@@ -8533,11 +8533,25 @@ match_suffix(fname)
     for (setsuf = p_su; *setsuf; )
     {
        setsuflen = copy_option_part(&setsuf, suf_buf, MAXSUFLEN, ".,");
-       if (fnamelen >= setsuflen
-               && fnamencmp(suf_buf, fname + fnamelen - setsuflen,
-                                             (size_t)setsuflen) == 0)
-           break;
-       setsuflen = 0;
+       if (setsuflen == 0)
+       {
+           char_u *tail = gettail(fname);
+
+           /* empty entry: match name without a '.' */
+           if (vim_strchr(tail, '.') == NULL)
+           {
+               setsuflen = 1;
+               break;
+           }
+       }
+       else
+       {
+           if (fnamelen >= setsuflen
+                   && fnamencmp(suf_buf, fname + fnamelen - setsuflen,
+                                                 (size_t)setsuflen) == 0)
+               break;
+           setsuflen = 0;
+       }
     }
     return (setsuflen != 0);
 }

diff --git a/src/version.c b/src/version.c
index aeb708fb8ab70cf19f5092a5a8e4810c4ed6f258..3f07803e231cdd5b43bc1b5f0f3cff1d711595d8 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -676,6 +676,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    234,
 /**/
     233,
 /**/