Mercurial > vim

changeset 1006:992d5c69d5e9 v7.0.132

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
updated for version 7.0-132
author vimboss
date Thu, 12 Oct 2006 19:14:26 +0000
parents 1dfe9032bd92
children 7d29124f77f5
files src/fileio.c src/version.c
diffstat 2 files changed, 16 insertions(+), 14 deletions(-) [+]
line wrap: on
line diff
--- 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
 
--- 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,