vim: src/fileio.c comparison

comparison src/fileio.c @ 1201:4d2585cf5950

updated for version 7.1b

author	vimboss
date	Thu, 10 May 2007 17:35:54 +0000
parents	f0dcee927c1d
children	da0991871b02

comparison

equal deleted inserted replaced

-:f58cb9bf1260
+:4d2585cf5950
 			error = TRUE;
 #ifdef FEAT_MBYTE
 		    else if (conv_restlen > 0)
 		    {
 			/* Reached end-of-file but some trailing bytes could
-			 * not be converted.  Trucated file? */
+			 * not be converted.  Truncated file? */
 			if (conv_error == 0)
 			    conv_error = linecnt;
 			if (bad_char_behavior != BAD_DROP)
 			{
 			    fio_flags = 0;	/* don't convert this */
 	}
 	linecnt = curbuf->b_ml.ml_line_count - linecnt;
 	if (filesize == 0)
 	    linecnt = 0;
 	if (newfile || read_buffer)
+	{
 	    redraw_curbuf_later(NOT_VALID);
+#ifdef FEAT_DIFF
+	    /* After reading the text into the buffer the diff info needs to
+	     * be updated. */
+	    diff_invalidate(curbuf);
+#endif
+#ifdef FEAT_FOLDING
+	    /* All folds in the window are invalid now.  Mark them for update
+	     * before triggering autocommands. */
+	    foldUpdateAll(curwin);
+#endif
+	}
 	else if (linecnt)		/* appended at least one line */
 	    appended_lines_mark(from, linecnt);
-#ifdef FEAT_DIFF
-	/* After reading the text into the buffer the diff info needs to be
-	 * updated. */
-	if (newfile || read_buffer)
-	    diff_invalidate(curbuf);
-#endif
 #ifndef ALWAYS_USE_GUI
 	/*
 	 * If we were reading from the same terminal as where messages go,
 	 * the screen will have been messed up.
 	 * Switch on raw mode now and clear the screen.
 #if defined(MACOS_CLASSIC) || defined(WIN3264)
 /* TODO: Is it need for MACOS_X? (Dany) */
 /*
 * On macintosh copy the original files attributes (i.e. the backup)
-* This is done in order to preserve the ressource fork and the
+* This is done in order to preserve the resource fork and the
-* Finder attribute (label, comments, custom icons, file creatore)
+* Finder attribute (label, comments, custom icons, file creator)
 */
 if (backup != NULL && overwriting && !append)
 {
 	if (backup_copy)
 	    (void)mch_copy_file_attribute(wfname, backup);
 if (!overwriting && !append)
 {
 	if (buf->b_ffname != NULL)
 	    (void)mch_copy_file_attribute(buf->b_ffname, wfname);
-	/* Should copy ressource fork */
+	/* Should copy resource fork */
 }
 #endif
 write_info.bw_fd = fd;
 	else if ((e = vim_strchr(ptr, '.')) == NULL)
 	    *s++ = '.';
 #endif
 	/*
 	 * If the extension doesn't start with '.', and there already is an
-	 * extension, it may need to be tructated
+	 * extension, it may need to be truncated
 	 */
 	else if ((int)STRLEN(e) + extlen > 4)
 	    s = e + 4 - extlen;
 }
 #if defined(OS2) || defined(USE_LONG_FNAME) || defined(WIN3264)
 #ifdef AMIGA
 /*
 * With MSDOS-compatible filesystems (crossdos, messydos) it is possible
 * that the name of the "to" file is the same as the "from" file, even
-* though the names are different. To avoid the chance of accidently
+* though the names are different. To avoid the chance of accidentally
 * deleting the "from" file (horror!) we lock it during the remove.
 *
 * When used for making a backup before writing the file: This should not
 * happen with ":w", because startscript() should detect this problem and
 * set buf->b_shortname, causing modname() to return a correct ".bak" file
 if (n < 0)
 {
 	errmsg = _("E210: Error reading \"%s\"");
 	to = from;
 }
-#ifndef UNIX	    /* for Unix mch_open() already set ther permission */
+#ifndef UNIX	    /* for Unix mch_open() already set the permission */
 mch_setperm(to, perm);
 #endif
 #ifdef HAVE_ACL
 mch_set_acl(to, acl);
 #endif
 if (autocmd_busy && !(force || autocmd_nested))
 	goto BYPASS_AU;
 #ifdef FEAT_EVAL
 /*
-* Quickly return when immdediately aborting on error, or when an interrupt
+* Quickly return when immediately aborting on error, or when an interrupt
 * occurred or an exception was thrown but not caught.
 */
 if (aborting())
 	goto BYPASS_AU;
 #endif

Mercurial > vim

comparison src/fileio.c @ 1201:4d2585cf5950