updated for version 7.0-132

diff --git a/src/fileio.c b/src/fileio.c
index 7bab84e55f2bf5153f4a0f50dad9c40866b03f2d..abbe1e7a0d3571e0902e2cba97a6107bf47c3a70 100644 (file)
--- 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 6703e79840e26030ca0a1305e032295243ab6377..b8be64aaa24d0ff1053297e215b25e938a107309 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -666,6 +666,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    132,
 /**/
     131,
 /**/