diff options
| author | vimboss <devnull@localhost> | 2006-10-12 19:14:26 +0000 |
|---|---|---|
| committer | vimboss <devnull@localhost> | 2006-10-12 19:14:26 +0000 |
| commit | bf8fda8be0077561a1cf5734c66831bed86f1778 (patch) | |
| tree | 2ca53f371454974840e9b54a93a9dc0fc83c0e23 | |
| parent | 603b4da1705172f1c1ec1517730c0f6ae9db6d36 (diff) | |
| download | vim-bf8fda8be0077561a1cf5734c66831bed86f1778.tar.gz | |
| -rw-r--r-- | src/fileio.c | 26 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 15 insertions, 13 deletions
diff --git a/src/fileio.c b/src/fileio.c index 7bab84e5..abbe1e7a 100644 --- a/src/fileio.c +++ b/src/fileio.c @@ -416,20 +416,20 @@ readfile(fname, sfname, from, lines_to_skip, lines_to_read, eap, flags) msg_scroll = msg_save; return FAIL; } - } -#endif -#if defined(MSDOS) || defined(MSWIN) || defined(OS2) - /* - * MS-Windows allows opening a device, but we will probably get stuck - * trying to read it. - */ - if (!p_odev && mch_nodetype(fname) == NODE_WRITABLE) - { - filemess(curbuf, fname, (char_u *)_("is a device (disabled with 'opendevice' option"), 0); - msg_end(); - msg_scroll = msg_save; - return FAIL; +# if defined(MSDOS) || defined(MSWIN) || defined(OS2) + /* + * MS-Windows allows opening a device, but we will probably get stuck + * trying to read it. + */ + if (!p_odev && mch_nodetype(fname) == NODE_WRITABLE) + { + filemess(curbuf, fname, (char_u *)_("is a device (disabled with 'opendevice' option"), 0); + msg_end(); + msg_scroll = msg_save; + return FAIL; + } +# endif } #endif diff --git a/src/version.c b/src/version.c index 6703e798..b8be64aa 100644 --- a/src/version.c +++ b/src/version.c @@ -667,6 +667,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 132, +/**/ 131, /**/ 130, |