diff options
| author | Bram Moolenaar <Bram@vim.org> | 2009-01-22 19:48:55 +0000 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2009-01-22 19:48:55 +0000 |
| commit | 5cc6a6e739de81fc72de411e69982cb08aac0c1c (patch) | |
| tree | a6bccab027beb8102d46b9020e19cc7a19c510a1 | |
| parent | 6768a3305a9bc0e10aabafcf2a211ebaf1721f73 (diff) | |
| download | vim-git-7.2.086.tar.gz | |
updated for version 7.2-086v7.2.086
| -rw-r--r-- | src/diff.c | 8 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 7 insertions, 3 deletions
diff --git a/src/diff.c b/src/diff.c index 33dd48344..c20d095d5 100644 --- a/src/diff.c +++ b/src/diff.c @@ -8,7 +8,7 @@ */ /* - * diff.c: code for diff'ing two or three buffers. + * diff.c: code for diff'ing two, three or four buffers. */ #include "vim.h" @@ -116,7 +116,7 @@ diff_buf_adjust(win) * Add a buffer to make diffs for. * Call this when a new buffer is being edited in the current window where * 'diff' is set. - * Marks the current buffer as being part of the diff and requireing updating. + * Marks the current buffer as being part of the diff and requiring updating. * This must be done before any autocmd, because a command may use info * about the screen contents. */ @@ -929,7 +929,7 @@ ex_diffpatch(eap) goto theend; #ifdef UNIX - /* Temporaraly chdir to /tmp, to avoid patching files in the current + /* Temporarily chdir to /tmp, to avoid patching files in the current * directory when the patch file contains more than one patch. When we * have our own temp dir use that instead, it will be cleaned up when we * exit (any .rej files created). Don't change directory if we can't @@ -2129,6 +2129,8 @@ ex_diffgetput(eap) EMSG2(_("E102: Can't find buffer \"%s\""), eap->arg); return; } + if (buf == curbuf) + return; /* nothing to do */ idx_other = diff_buf_idx(buf); if (idx_other == DB_COUNT) { diff --git a/src/version.c b/src/version.c index 585940887..48bfe29df 100644 --- a/src/version.c +++ b/src/version.c @@ -677,6 +677,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 86, +/**/ 85, /**/ 84, |