diff --git a/src/errors.h b/src/errors.h index bb807e7d56..8175892881 100644 --- a/src/errors.h +++ b/src/errors.h @@ -3554,12 +3554,10 @@ EXTERN char e_invalid_format_specifier_str[] INIT(= N_("E1505: Invalid format specifier: %s")); EXTERN char e_xattr_erange[] INIT(= N_("E1506: Buffer too small to copy xattr value or key")); -EXTERN char e_xattr_enotsup[] - INIT(= N_("E1507: Extended attributes are not supported by the filesystem")); EXTERN char e_xattr_e2big[] INIT(= N_("E1508: Size of the extended attribute value is larger than the maximum size allowed")); EXTERN char e_xattr_other[] INIT(= N_("E1509: Error occured when reading or writing extended attribute")); -// E1509 - E1519 unused +// E1507, E1509 - E1519 unused EXTERN char e_aptypes_is_null_nr_str[] INIT(= "E1520: Internal error: ap_types or ap_types[idx] is NULL: %d: %s"); diff --git a/src/os_unix.c b/src/os_unix.c index 9356db0b75..237171b4fa 100644 --- a/src/os_unix.c +++ b/src/os_unix.c @@ -3154,8 +3154,9 @@ mch_copy_xattr(char_u *from_file, char_u *to_file) errmsg = e_xattr_e2big; goto error_exit; case ENOTSUP: - errmsg = e_xattr_enotsup; - goto error_exit; + case EACCES: + case EPERM: + break; case ERANGE: errmsg = e_xattr_erange; goto error_exit; diff --git a/src/version.c b/src/version.c index b46d20c2c8..9022edb535 100644 --- a/src/version.c +++ b/src/version.c @@ -704,6 +704,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 1975, /**/ 1974, /**/