1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
|
To: vim-dev@vim.org
Subject: Patch 7.2.086
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------
Patch 7.2.086
Problem: Using ":diffget 1" in buffer 1 corrupts the text.
Solution: Don't do anything when source and destination of ":diffget" or
":diffput" is the same buffer. (Dominique Pelle)
Files: src/diff.c
*** ../vim-7.2.085/src/diff.c Sun Nov 30 15:15:56 2008
--- src/diff.c Wed Jan 14 20:40:25 2009
***************
*** 8,14 ****
*/
/*
! * diff.c: code for diff'ing two or three buffers.
*/
#include "vim.h"
--- 8,14 ----
*/
/*
! * diff.c: code for diff'ing two, three or four buffers.
*/
#include "vim.h"
***************
*** 116,122 ****
* 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.
* This must be done before any autocmd, because a command may use info
* about the screen contents.
*/
--- 116,122 ----
* 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 requiring updating.
* This must be done before any autocmd, because a command may use info
* about the screen contents.
*/
***************
*** 929,935 ****
goto theend;
#ifdef UNIX
! /* Temporaraly 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
--- 929,935 ----
goto theend;
#ifdef UNIX
! /* 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,2134 ****
--- 2129,2136 ----
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)
{
*** ../vim-7.2.085/src/version.c Thu Jan 22 18:32:55 2009
--- src/version.c Thu Jan 22 20:46:54 2009
***************
*** 678,679 ****
--- 678,681 ----
{ /* Add new patch number below this line */
+ /**/
+ 86,
/**/
--
Shift happens.
-- Doppler
/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\ download, build and distribute -- http://www.A-A-P.org ///
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
|
