# HG changeset patch # User Bram Moolenaar # Date 1377875221 -7200 # Node ID 9801d06e7b4ccdcd02cf40bee34eaaada0ca0409 # Parent 4bc1b41f558cde7280ec91e1f94f0470b4561779 updated for version 7.4.014 Problem: MS-Windows: check for writing to device does not work. Solution: Fix #ifdefs. (Ken Takata) diff --git a/src/fileio.c b/src/fileio.c --- a/src/fileio.c +++ b/src/fileio.c @@ -428,13 +428,13 @@ readfile(fname, sfname, from, lines_to_s } } + if (!read_stdin && !read_buffer) + { #ifdef UNIX - /* - * On Unix it is possible to read a directory, so we have to - * check for it before the mch_open(). - */ - if (!read_stdin && !read_buffer) - { + /* + * On Unix it is possible to read a directory, so we have to + * check for it before the mch_open(). + */ perm = mch_getperm(fname); if (perm >= 0 && !S_ISREG(perm) /* not a regular file ... */ # ifdef S_ISFIFO @@ -457,8 +457,8 @@ readfile(fname, sfname, from, lines_to_s msg_scroll = msg_save; return FAIL; } - -# if defined(MSDOS) || defined(MSWIN) || defined(OS2) +#endif +#if defined(MSDOS) || defined(MSWIN) || defined(OS2) /* * MS-Windows allows opening a device, but we will probably get stuck * trying to read it. @@ -470,9 +470,8 @@ readfile(fname, sfname, from, lines_to_s msg_scroll = msg_save; return FAIL; } -# endif - } -#endif +#endif + } /* Set default or forced 'fileformat' and 'binary'. */ set_file_options(set_options, eap); diff --git a/src/version.c b/src/version.c --- a/src/version.c +++ b/src/version.c @@ -739,6 +739,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 14, +/**/ 13, /**/ 12,