From: Bram Moolenaar <Bram@vim.org>
Date: Wed, 2 Apr 2014 21:09:26 +0000 (+0200)
Subject: updated for version 7.4.244
X-Git-Tag: v7.4.244
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=57a728d1df7451f5b2b6b1f933182b5af9513d83;p=vim

updated for version 7.4.244
Problem:    The smack feature causes stray error messages.
Solution:   Remove the error messages.
---

diff --git a/src/os_unix.c b/src/os_unix.c
index b6778f255..32701fdc7 100644
--- a/src/os_unix.c
+++ b/src/os_unix.c
@@ -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;
 	    }
 	}
diff --git a/src/version.c b/src/version.c
index 9881075dd..da98b0ab9 100644
--- a/src/version.c
+++ b/src/version.c
@@ -734,6 +734,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    244,
 /**/
     243,
 /**/