]> granicus.if.org Git - vim/commitdiff
updated for version 7.4.244 v7.4.244
authorBram Moolenaar <Bram@vim.org>
Wed, 2 Apr 2014 21:09:26 +0000 (23:09 +0200)
committerBram Moolenaar <Bram@vim.org>
Wed, 2 Apr 2014 21:09:26 +0000 (23:09 +0200)
Problem:    The smack feature causes stray error messages.
Solution:   Remove the error messages.

src/os_unix.c
src/version.c

index b6778f2550b27d02fba50524bf7feb45785c9bad..32701fdc7820cf6b53654e9560b9c2cdb48ba05e 100644 (file)
@@ -2875,14 +2875,8 @@ mch_copy_sec(from_file, to_file)
                case ENODATA:
                    /* no attribute of this name */
                    ret = removexattr((char*)to_file, name);
-                   if (ret < 0 && errno != ENODATA)
-                   {
-                       MSG_PUTS(_("Could not remove security context "));
-                       MSG_PUTS(name);
-                       MSG_PUTS(_(" for "));
-                       msg_outtrans(to_file);
-                       msg_putchar('\n');
-                   }
+                   /* Silently ignore errors, apparently this happens when
+                    * smack is not actually being used. */
                    break;
            }
        }
index 9881075dd45ef3e852f761541d03ca3acc6813d6..da98b0ab99464b0a293480ca60c2a76da4a8709e 100644 (file)
@@ -734,6 +734,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    244,
 /**/
     243,
 /**/