|
Karsten Hopp |
1a73e3 |
To: vim-dev@vim.org
|
|
Karsten Hopp |
1a73e3 |
Subject: patch 7.0.201
|
|
Karsten Hopp |
1a73e3 |
Fcc: outbox
|
|
Karsten Hopp |
1a73e3 |
From: Bram Moolenaar <Bram@moolenaar.net>
|
|
Karsten Hopp |
1a73e3 |
Mime-Version: 1.0
|
|
Karsten Hopp |
1a73e3 |
Content-Type: text/plain; charset=ISO-8859-1
|
|
Karsten Hopp |
1a73e3 |
Content-Transfer-Encoding: 8bit
|
|
Karsten Hopp |
1a73e3 |
------------
|
|
Karsten Hopp |
1a73e3 |
|
|
Karsten Hopp |
1a73e3 |
Patch 7.0.201
|
|
Karsten Hopp |
1a73e3 |
Problem: Message for ":diffput" about buffer not being in diff mode may be
|
|
Karsten Hopp |
1a73e3 |
wrong.
|
|
Karsten Hopp |
1a73e3 |
Solution: Check for buffer in diff mode but not modifiable.
|
|
Karsten Hopp |
1a73e3 |
Files: src/diff.c
|
|
Karsten Hopp |
1a73e3 |
|
|
Karsten Hopp |
1a73e3 |
|
|
Karsten Hopp |
1a73e3 |
*** ../vim-7.0.200/src/diff.c Tue Feb 20 03:52:04 2007
|
|
Karsten Hopp |
1a73e3 |
--- src/diff.c Fri Feb 16 01:18:41 2007
|
|
Karsten Hopp |
1a73e3 |
***************
|
|
Karsten Hopp |
1a73e3 |
*** 2014,2019 ****
|
|
Karsten Hopp |
1a73e3 |
--- 2014,2020 ----
|
|
Karsten Hopp |
1a73e3 |
int start_skip, end_skip;
|
|
Karsten Hopp |
1a73e3 |
int new_count;
|
|
Karsten Hopp |
1a73e3 |
int buf_empty;
|
|
Karsten Hopp |
1a73e3 |
+ int found_not_ma = FALSE;
|
|
Karsten Hopp |
1a73e3 |
|
|
Karsten Hopp |
1a73e3 |
/* Find the current buffer in the list of diff buffers. */
|
|
Karsten Hopp |
1a73e3 |
idx_cur = diff_buf_idx(curbuf);
|
|
Karsten Hopp |
1a73e3 |
***************
|
|
Karsten Hopp |
1a73e3 |
*** 2028,2040 ****
|
|
Karsten Hopp |
1a73e3 |
/* No argument: Find the other buffer in the list of diff buffers. */
|
|
Karsten Hopp |
1a73e3 |
for (idx_other = 0; idx_other < DB_COUNT; ++idx_other)
|
|
Karsten Hopp |
1a73e3 |
if (curtab->tp_diffbuf[idx_other] != curbuf
|
|
Karsten Hopp |
1a73e3 |
! && curtab->tp_diffbuf[idx_other] != NULL
|
|
Karsten Hopp |
1a73e3 |
! && (eap->cmdidx != CMD_diffput
|
|
Karsten Hopp |
1a73e3 |
! || curtab->tp_diffbuf[idx_other]->b_p_ma))
|
|
Karsten Hopp |
1a73e3 |
! break;
|
|
Karsten Hopp |
1a73e3 |
if (idx_other == DB_COUNT)
|
|
Karsten Hopp |
1a73e3 |
{
|
|
Karsten Hopp |
1a73e3 |
! EMSG(_("E100: No other buffer in diff mode"));
|
|
Karsten Hopp |
1a73e3 |
return;
|
|
Karsten Hopp |
1a73e3 |
}
|
|
Karsten Hopp |
1a73e3 |
|
|
Karsten Hopp |
1a73e3 |
--- 2029,2047 ----
|
|
Karsten Hopp |
1a73e3 |
/* No argument: Find the other buffer in the list of diff buffers. */
|
|
Karsten Hopp |
1a73e3 |
for (idx_other = 0; idx_other < DB_COUNT; ++idx_other)
|
|
Karsten Hopp |
1a73e3 |
if (curtab->tp_diffbuf[idx_other] != curbuf
|
|
Karsten Hopp |
1a73e3 |
! && curtab->tp_diffbuf[idx_other] != NULL)
|
|
Karsten Hopp |
1a73e3 |
! {
|
|
Karsten Hopp |
1a73e3 |
! if (eap->cmdidx != CMD_diffput
|
|
Karsten Hopp |
1a73e3 |
! || curtab->tp_diffbuf[idx_other]->b_p_ma)
|
|
Karsten Hopp |
1a73e3 |
! break;
|
|
Karsten Hopp |
1a73e3 |
! found_not_ma = TRUE;
|
|
Karsten Hopp |
1a73e3 |
! }
|
|
Karsten Hopp |
1a73e3 |
if (idx_other == DB_COUNT)
|
|
Karsten Hopp |
1a73e3 |
{
|
|
Karsten Hopp |
1a73e3 |
! if (found_not_ma)
|
|
Karsten Hopp |
1a73e3 |
! EMSG(_("E793: No other buffer in diff mode is modifiable"));
|
|
Karsten Hopp |
1a73e3 |
! else
|
|
Karsten Hopp |
1a73e3 |
! EMSG(_("E100: No other buffer in diff mode"));
|
|
Karsten Hopp |
1a73e3 |
return;
|
|
Karsten Hopp |
1a73e3 |
}
|
|
Karsten Hopp |
1a73e3 |
|
|
Karsten Hopp |
1a73e3 |
*** ../vim-7.0.200/src/version.c Tue Feb 20 03:52:04 2007
|
|
Karsten Hopp |
1a73e3 |
--- src/version.c Tue Feb 20 04:46:00 2007
|
|
Karsten Hopp |
1a73e3 |
***************
|
|
Karsten Hopp |
1a73e3 |
*** 668,669 ****
|
|
Karsten Hopp |
1a73e3 |
--- 668,671 ----
|
|
Karsten Hopp |
1a73e3 |
{ /* Add new patch number below this line */
|
|
Karsten Hopp |
1a73e3 |
+ /**/
|
|
Karsten Hopp |
1a73e3 |
+ 201,
|
|
Karsten Hopp |
1a73e3 |
/**/
|
|
Karsten Hopp |
1a73e3 |
|
|
Karsten Hopp |
1a73e3 |
--
|
|
Karsten Hopp |
1a73e3 |
hundred-and-one symptoms of being an internet addict:
|
|
Karsten Hopp |
1a73e3 |
159. You get excited whenever discussing your hard drive.
|
|
Karsten Hopp |
1a73e3 |
|
|
Karsten Hopp |
1a73e3 |
/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
|
|
Karsten Hopp |
1a73e3 |
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
|
|
Karsten Hopp |
1a73e3 |
\\\ download, build and distribute -- http://www.A-A-P.org ///
|
|
Karsten Hopp |
1a73e3 |
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
|