# HG changeset patch # User vimboss # Date 1160680466 0 # Node ID 992d5c69d5e917b03abcee24d2fbed8348e21c23 # Parent 1dfe9032bd92ef7ab7bf0baf0f0c1f61da68bce6 updated for version 7.0-132 diff --git a/src/fileio.c b/src/fileio.c --- a/src/fileio.c +++ b/src/fileio.c @@ -416,20 +416,20 @@ readfile(fname, sfname, from, lines_to_s 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 --- 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,