|
Karsten Hopp |
6021df |
To: vim-dev@vim.org
|
|
Karsten Hopp |
6021df |
Subject: patch 7.1.016
|
|
Karsten Hopp |
6021df |
Fcc: outbox
|
|
Karsten Hopp |
6021df |
From: Bram Moolenaar <Bram@moolenaar.net>
|
|
Karsten Hopp |
6021df |
Mime-Version: 1.0
|
|
Karsten Hopp |
6021df |
Content-Type: text/plain; charset=ISO-8859-1
|
|
Karsten Hopp |
6021df |
Content-Transfer-Encoding: 8bit
|
|
Karsten Hopp |
6021df |
------------
|
|
Karsten Hopp |
6021df |
|
|
Karsten Hopp |
6021df |
Patch 7.1.016 (after patch 7.1.012)
|
|
Karsten Hopp |
6021df |
Problem: Error message about setting 'diff' to a string.
|
|
Karsten Hopp |
6021df |
Solution: Don't pass an empty string to set_option_value() when setting
|
|
Karsten Hopp |
6021df |
'diff'.
|
|
Karsten Hopp |
6021df |
Files: src/quickfix.c, src/popupmnu.c
|
|
Karsten Hopp |
6021df |
|
|
Karsten Hopp |
6021df |
|
|
Karsten Hopp |
6021df |
*** ../vim-7.1.015/src/quickfix.c Sun Feb 4 02:58:00 2007
|
|
Karsten Hopp |
6021df |
--- src/quickfix.c Thu Jun 28 18:56:16 2007
|
|
Karsten Hopp |
6021df |
***************
|
|
Karsten Hopp |
6021df |
*** 2331,2337 ****
|
|
Karsten Hopp |
6021df |
set_option_value((char_u *)"bt", 0L, (char_u *)"quickfix",
|
|
Karsten Hopp |
6021df |
OPT_LOCAL);
|
|
Karsten Hopp |
6021df |
set_option_value((char_u *)"bh", 0L, (char_u *)"wipe", OPT_LOCAL);
|
|
Karsten Hopp |
6021df |
! set_option_value((char_u *)"diff", 0L, (char_u *)"", OPT_LOCAL);
|
|
Karsten Hopp |
6021df |
}
|
|
Karsten Hopp |
6021df |
|
|
Karsten Hopp |
6021df |
/* Only set the height when still in the same tab page and there is no
|
|
Karsten Hopp |
6021df |
--- 2331,2337 ----
|
|
Karsten Hopp |
6021df |
set_option_value((char_u *)"bt", 0L, (char_u *)"quickfix",
|
|
Karsten Hopp |
6021df |
OPT_LOCAL);
|
|
Karsten Hopp |
6021df |
set_option_value((char_u *)"bh", 0L, (char_u *)"wipe", OPT_LOCAL);
|
|
Karsten Hopp |
6021df |
! set_option_value((char_u *)"diff", 0L, NULL, OPT_LOCAL);
|
|
Karsten Hopp |
6021df |
}
|
|
Karsten Hopp |
6021df |
|
|
Karsten Hopp |
6021df |
/* Only set the height when still in the same tab page and there is no
|
|
Karsten Hopp |
6021df |
*** ../vim-7.1.015/src/popupmnu.c Tue Mar 27 12:42:05 2007
|
|
Karsten Hopp |
6021df |
--- src/popupmnu.c Thu Jun 28 19:00:51 2007
|
|
Karsten Hopp |
6021df |
***************
|
|
Karsten Hopp |
6021df |
*** 466,472 ****
|
|
Karsten Hopp |
6021df |
set_option_value((char_u *)"bh", 0L,
|
|
Karsten Hopp |
6021df |
(char_u *)"wipe", OPT_LOCAL);
|
|
Karsten Hopp |
6021df |
set_option_value((char_u *)"diff", 0L,
|
|
Karsten Hopp |
6021df |
! (char_u *)"", OPT_LOCAL);
|
|
Karsten Hopp |
6021df |
}
|
|
Karsten Hopp |
6021df |
}
|
|
Karsten Hopp |
6021df |
if (res == OK)
|
|
Karsten Hopp |
6021df |
--- 466,472 ----
|
|
Karsten Hopp |
6021df |
set_option_value((char_u *)"bh", 0L,
|
|
Karsten Hopp |
6021df |
(char_u *)"wipe", OPT_LOCAL);
|
|
Karsten Hopp |
6021df |
set_option_value((char_u *)"diff", 0L,
|
|
Karsten Hopp |
6021df |
! NULL, OPT_LOCAL);
|
|
Karsten Hopp |
6021df |
}
|
|
Karsten Hopp |
6021df |
}
|
|
Karsten Hopp |
6021df |
if (res == OK)
|
|
Karsten Hopp |
6021df |
*** ../vim-7.1.015/src/version.c Thu Jun 28 13:02:22 2007
|
|
Karsten Hopp |
6021df |
--- src/version.c Thu Jun 28 21:20:20 2007
|
|
Karsten Hopp |
6021df |
***************
|
|
Karsten Hopp |
6021df |
*** 668,669 ****
|
|
Karsten Hopp |
6021df |
--- 668,671 ----
|
|
Karsten Hopp |
6021df |
{ /* Add new patch number below this line */
|
|
Karsten Hopp |
6021df |
+ /**/
|
|
Karsten Hopp |
6021df |
+ 16,
|
|
Karsten Hopp |
6021df |
/**/
|
|
Karsten Hopp |
6021df |
|
|
Karsten Hopp |
6021df |
--
|
|
Karsten Hopp |
6021df |
We do not stumble over mountains, but over molehills.
|
|
Karsten Hopp |
6021df |
Confucius
|
|
Karsten Hopp |
6021df |
|
|
Karsten Hopp |
6021df |
/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
|
|
Karsten Hopp |
6021df |
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
|
|
Karsten Hopp |
6021df |
\\\ download, build and distribute -- http://www.A-A-P.org ///
|
|
Karsten Hopp |
6021df |
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
|