From: Bram Moolenaar <Bram@vim.org>
Date: Thu, 12 Oct 2006 19:14:26 +0000 (+0000)
Subject: updated for version 7.0-132
X-Git-Tag: v7.0.132
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c67764a7053fd2b4fe9c7016fb89cf81691edbe4;p=vim

updated for version 7.0-132
---

diff --git a/src/fileio.c b/src/fileio.c
index 7bab84e55..abbe1e7a0 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 6703e7984..b8be64aaa 100644
--- 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,
 /**/