vim: src/fileio.c comparison

updated for version 7.0079

comparison

equal deleted inserted replaced

-:86cd0a77d2ae
+:006e9c8a6a8a
 	fenc_alloced = FALSE;
 }
 else if (curbuf->b_help)
 {
 	char_u	    firstline[80];
+	int	    fc;
 	/* Help files are either utf-8 or latin1.  Try utf-8 first, if this
 	 * fails it must be latin1.
 	 * Always do this when 'encoding' is "utf-8".  Otherwise only do
 	 * this when needed to avoid [converted] remarks all the time.
 	 * It is needed when the first line contains non-ASCII characters.
 	 * That is only in *.??x files. */
 	fenc = (char_u *)"latin1";
 	c = enc_utf8;
-	if (!c && !read_stdin && TOLOWER_ASC(fname[STRLEN(fname) - 1]) == 'x')
+	if (!c && !read_stdin)
 	{
-	    /* Read the first line (and a bit more).  Immediately rewind to
+	    fc = fname[STRLEN(fname) - 1];
-	     * the start of the file.  If the read() fails "len" is -1. */
+	    if (TOLOWER_ASC(fc) == 'x')
-	    len = vim_read(fd, firstline, 80);
+	    {
-	    lseek(fd, (off_t)0L, SEEK_SET);
+		/* Read the first line (and a bit more).  Immediately rewind to
-	    for (p = firstline; p < firstline + len; ++p)
+		 * the start of the file.  If the read() fails "len" is -1. */
-		if (*p >= 0x80)
+		len = vim_read(fd, firstline, 80);
-		{
+		lseek(fd, (off_t)0L, SEEK_SET);
-		    c = TRUE;
+		for (p = firstline; p < firstline + len; ++p)
-		    break;
+		    if (*p >= 0x80)
-		}
+		    {
+			c = TRUE;
+			break;
+		    }
+	    }
 	}
 	if (c)
 	{
 	    fenc_next = fenc;

Mercurial > vim