vim: src/undo.c comparison

comparison src/undo.c @ 2394:a3aca345aafa vim73

Add the 'undoreload' option to be able to undo a file reload.

author	Bram Moolenaar <bram@vim.org>
date	Sat, 24 Jul 2010 20:27:03 +0200
parents	85b7dc8da5eb
children	8f6106dd3d12

comparison

equal deleted inserted replaced

-:210a5605e126
+:a3aca345aafa
 #include "vim.h"
 static void u_unch_branch __ARGS((u_header_T *uhp));
 static u_entry_T *u_get_headentry __ARGS((void));
 static void u_getbot __ARGS((void));
-static int u_savecommon __ARGS((linenr_T, linenr_T, linenr_T));
 static void u_doit __ARGS((int count));
 static void u_undoredo __ARGS((int undo));
 static void u_undo_end __ARGS((int did_undo, int absolute));
 static void u_add_time __ARGS((char_u *buf, size_t buflen, time_t tt));
 static void u_freeheader __ARGS((buf_T *buf, u_header_T *uhp, u_header_T **uhpp));
 	return FALSE;	/* rely on caller to do error messages */
 if (top + 2 == bot)
 	u_saveline((linenr_T)(top + 1));
-return (u_savecommon(top, bot, (linenr_T)0));
+return (u_savecommon(top, bot, (linenr_T)0, FALSE));
 }
 /*
 * Save the line "lnum" (used by ":s" and "~" command).
 * The line is replaced, so the new bottom line is lnum + 1.
 linenr_T	lnum;
 {
 if (undo_off)
 	return OK;
-return (u_savecommon(lnum - 1, lnum + 1, lnum + 1));
+return (u_savecommon(lnum - 1, lnum + 1, lnum + 1, FALSE));
 }
 /*
 * A new line is inserted before line "lnum" (used by :s command).
 * The line is inserted, so the new bottom line is lnum + 1.
 linenr_T	lnum;
 {
 if (undo_off)
 	return OK;
-return (u_savecommon(lnum - 1, lnum, lnum + 1));
+return (u_savecommon(lnum - 1, lnum, lnum + 1, FALSE));
 }
 /*
 * Save the lines "lnum" - "lnum" + nlines (used by delete command).
 * The lines are deleted, so the new bottom line is lnum, unless the buffer
 {
 if (undo_off)
 	return OK;
 return (u_savecommon(lnum - 1, lnum + nlines,
-			nlines == curbuf->b_ml.ml_line_count ? 2 : lnum));
+		     nlines == curbuf->b_ml.ml_line_count ? 2 : lnum, FALSE));
 }
 /*
 * Return TRUE when undo is allowed.  Otherwise give an error message and
 * return FALSE.
 /*
 * Common code for various ways to save text before a change.
 * "top" is the line above the first changed line.
 * "bot" is the line below the last changed line.
+* "newbot" is the new bottom line.  Use zero when not known.
+* "reload" is TRUE when saving for a buffer reload.
 * Careful: may trigger autocommands that reload the buffer.
 * Returns FAIL when lines could not be saved, OK otherwise.
 */
-static int
+int
-u_savecommon(top, bot, newbot)
+u_savecommon(top, bot, newbot, reload)
 linenr_T	top, bot;
 linenr_T	newbot;
+int		reload;
 {
 linenr_T	lnum;
 long	i;
 u_header_T	*uhp;
 u_header_T	*old_curhead;
 u_entry_T	*uep;
 u_entry_T	*prev_uep;
 long	size;
-/* When making changes is not allowed return FAIL.  It's a crude way to
+if (!reload)
-* make all change commands fail. */
+{
-if (!undo_allowed())
+	/* When making changes is not allowed return FAIL.  It's a crude way
-	return FAIL;
+	 * to make all change commands fail. */
+	if (!undo_allowed())
+	    return FAIL;
+#ifdef FEAT_NETBEANS_INTG
+	/*
+	 * Netbeans defines areas that cannot be modified.  Bail out here when
+	 * trying to change text in a guarded area.
+	 */
+	if (netbeans_active())
+	{
+	    if (netbeans_is_guarded(top, bot))
+	    {
+		EMSG(_(e_guarded));
+		return FAIL;
+	    }
+	    if (curbuf->b_p_ro)
+	    {
+		EMSG(_(e_nbreadonly));
+		return FAIL;
+	    }
+	}
+#endif
+#ifdef FEAT_AUTOCMD
+	/*
+	 * Saving text for undo means we are going to make a change.  Give a
+	 * warning for a read-only file before making the change, so that the
+	 * FileChangedRO event can replace the buffer with a read-write version
+	 * (e.g., obtained from a source control system).
+	 */
+	change_warning(0);
+	if (bot > curbuf->b_ml.ml_line_count + 1)
+	{
+	    /* This happens when the FileChangedRO autocommand changes the
+	     * file in a way it becomes shorter. */
+	    EMSG(_("E834: Line count changed unexpectedly"));
+	    return FAIL;
+	}
+#endif
+}
 #ifdef U_DEBUG
 u_check(FALSE);
-#endif
-#ifdef FEAT_NETBEANS_INTG
-/*
-* Netbeans defines areas that cannot be modified.  Bail out here when
-* trying to change text in a guarded area.
-*/
-if (netbeans_active())
-{
-	if (netbeans_is_guarded(top, bot))
-	{
-	    EMSG(_(e_guarded));
-	    return FAIL;
-	}
-	if (curbuf->b_p_ro)
-	{
-	    EMSG(_(e_nbreadonly));
-	    return FAIL;
-	}
-}
-#endif
-#ifdef FEAT_AUTOCMD
-/*
-* Saving text for undo means we are going to make a change.  Give a
-* warning for a read-only file before making the change, so that the
-* FileChangedRO event can replace the buffer with a read-write version
-* (e.g., obtained from a source control system).
-*/
-change_warning(0);
-if (bot > curbuf->b_ml.ml_line_count + 1)
-{
-	/* This happens when the FileChangedRO autocommand changes the file in
-	 * a way it becomes shorter. */
-	EMSG(_("E834: Line count changed unexpectedly"));
-	return FAIL;
-}
 #endif
 size = bot - top - 1;
 /*
 	curbuf->b_u_synced = FALSE;  /* no entries, nothing to do */
 }
 }
 /*
-* Called after writing the file and setting b_changed to FALSE.
+* Called after writing or reloading the file and setting b_changed to FALSE.
 * Now an undo means that the buffer is modified.
 */
 void
 u_unchanged(buf)
 buf_T	*buf;
 	return;
 }
 /* first save the line for the 'u' command */
 if (u_savecommon(curbuf->b_u_line_lnum - 1,
-				curbuf->b_u_line_lnum + 1, (linenr_T)0) == FAIL)
+		       curbuf->b_u_line_lnum + 1, (linenr_T)0, FALSE) == FAIL)
 	return;
 oldp = u_save_line(curbuf->b_u_line_lnum);
 if (oldp == NULL)
 {
 	do_outofmem_msg((long_u)0);

Mercurial > vim

comparison src/undo.c @ 2394:a3aca345aafa vim73