diff options
| author | Bram Moolenaar <Bram@vim.org> | 2013-08-30 17:07:01 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2013-08-30 17:07:01 +0200 |
| commit | 4e4f529792c27442b7ad7222cff329907ec389fe (patch) | |
| tree | 81268ca17b57b3e5ec8e22e6c99b32bfccb9a376 | |
| parent | d2a203bb58cc546ffb81becf05380c52cb8bae31 (diff) | |
| download | vim-git-4e4f529792c27442b7ad7222cff329907ec389fe.tar.gz | |
updated for version 7.4.014v7.4.014
Problem: MS-Windows: check for writing to device does not work.
Solution: Fix #ifdefs. (Ken Takata)
| -rw-r--r-- | src/fileio.c | 17 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 10 insertions, 9 deletions
diff --git a/src/fileio.c b/src/fileio.c index 010d933a1..233990bf5 100644 --- a/src/fileio.c +++ b/src/fileio.c @@ -428,13 +428,13 @@ readfile(fname, sfname, from, lines_to_skip, lines_to_read, eap, flags) } } -#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) { +#ifdef UNIX + /* + * 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_skip, lines_to_read, eap, flags) 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_skip, lines_to_read, eap, flags) msg_scroll = msg_save; return FAIL; } -# 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 index 13ff1ca52..e8b935966 100644 --- 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, |