diff options
| author | Bram Moolenaar <Bram@vim.org> | 2010-07-24 20:27:03 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2010-07-24 20:27:03 +0200 |
| commit | 59f931ef54d143eb92f9b9168eb74fb061c39294 (patch) | |
| tree | bb0116b64dbebf8a2c4f442a0514e8d2ec6f2d26 /src/ex_cmds.c | |
| parent | 72ada0f8c2655e365d9284bcc9243e29e5951f04 (diff) | |
| download | vim-git-59f931ef54d143eb92f9b9168eb74fb061c39294.tar.gz | |
Add the 'undoreload' option to be able to undo a file reload.
Diffstat (limited to 'src/ex_cmds.c')
| -rw-r--r-- | src/ex_cmds.c | 22 |
1 files changed, 19 insertions, 3 deletions
diff --git a/src/ex_cmds.c b/src/ex_cmds.c index 602c340da..20a39ffff 100644 --- a/src/ex_cmds.c +++ b/src/ex_cmds.c @@ -3144,6 +3144,7 @@ do_ecmd(fnum, ffname, sfname, eap, newlnum, flags, oldwin) #ifdef FEAT_SPELL int did_get_winopts = FALSE; #endif + int readfile_flags = 0; if (eap != NULL) command = eap->do_ecmd_cmd; @@ -3570,7 +3571,22 @@ do_ecmd(fnum, ffname, sfname, eap, newlnum, flags, oldwin) else new_name = NULL; #endif - buf_freeall(curbuf, FALSE, FALSE); /* free all things for buffer */ + if (p_ur < 0 || curbuf->b_ml.ml_line_count <= p_ur) + { + /* Save all the text, so that the reload can be undone. + * Sync first so that this is a separate undo-able action. */ + u_sync(FALSE); + if (u_savecommon(0, curbuf->b_ml.ml_line_count + 1, 0, TRUE) + == FAIL) + goto theend; + u_unchanged(curbuf); + buf_freeall(curbuf, BFA_KEEP_UNDO); + + /* tell readfile() not to clear or reload undo info */ + readfile_flags = READ_KEEP_UNDO; + } + else + buf_freeall(curbuf, 0); /* free all things for buffer */ #ifdef FEAT_AUTOCMD /* If autocommands deleted the buffer we were going to re-edit, give * up and jump to the end. */ @@ -3667,10 +3683,10 @@ do_ecmd(fnum, ffname, sfname, eap, newlnum, flags, oldwin) * Open the buffer and read the file. */ #if defined(FEAT_AUTOCMD) && defined(FEAT_EVAL) - if (should_abort(open_buffer(FALSE, eap))) + if (should_abort(open_buffer(FALSE, eap, readfile_flags))) retval = FAIL; #else - (void)open_buffer(FALSE, eap); + (void)open_buffer(FALSE, eap, readfile_flags); #endif #if defined(HAS_SWAP_EXISTS_ACTION) |