rpms/vim
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge remote branch 'fedora/f17' into rhel-7.0

Browse Source
This commit is contained in:
Daniel Mach 2012-05-09 03:27:39 -04:00
commit 9100f70c5a
47 changed files with 7997 additions and 565 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

88
7.3.472 Normal file
View File

@ -0,0 +1,88 @@
To: vim_dev@googlegroups.com
Subject: Patch 7.3.472
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------
Patch 7.3.472
Problem: Crash when using ":redraw" in a BufEnter autocommand and
switching to another tab. (驼峰)
Solution: Move triggering the the autocommands to after correcting the
option values. Also check the row value to be out of bounds.
(Christian Brabandt, Sergey Khorev)
Files: src/screen.c, src/window.c
*** ../vim-7.3.471/src/screen.c 2012-02-04 23:34:57.000000000 +0100
--- src/screen.c 2012-03-16 18:59:20.000000000 +0100
***************
*** 5371,5376 ****
--- 5371,5382 ----
# define CHAR_CELLS 1
#endif
+ /* Check for illegal row and col, just in case. */
+ if (row >= Rows)
+ row = Rows - 1;
+ if (endcol > Columns)
+ endcol = Columns;
+
# ifdef FEAT_CLIPBOARD
clip_may_clear_selection(row, row);
# endif
*** ../vim-7.3.471/src/window.c 2012-02-22 14:58:24.000000000 +0100
--- src/window.c 2012-03-16 18:43:01.000000000 +0100
***************
*** 3676,3688 ****
win_enter_ext(tp->tp_curwin, FALSE, TRUE);
prevwin = next_prevwin;
- #ifdef FEAT_AUTOCMD
- apply_autocmds(EVENT_TABENTER, NULL, NULL, FALSE, curbuf);
-
- if (old_curbuf != curbuf)
- apply_autocmds(EVENT_BUFENTER, NULL, NULL, FALSE, curbuf);
- #endif
-
last_status(FALSE); /* status line may appear or disappear */
(void)win_comp_pos(); /* recompute w_winrow for all windows */
must_redraw = CLEAR; /* need to redraw everything */
--- 3676,3681 ----
***************
*** 3712,3717 ****
--- 3705,3718 ----
gui_may_update_scrollbars();
#endif
+ #ifdef FEAT_AUTOCMD
+ /* Apply autocommands after updating the display, when 'rows' and
+ * 'columns' have been set correctly. */
+ apply_autocmds(EVENT_TABENTER, NULL, NULL, FALSE, curbuf);
+ if (old_curbuf != curbuf)
+ apply_autocmds(EVENT_BUFENTER, NULL, NULL, FALSE, curbuf);
+ #endif
+
redraw_all_later(CLEAR);
}
*** ../vim-7.3.471/src/version.c 2012-03-16 14:32:10.000000000 +0100
--- src/version.c 2012-03-16 19:02:53.000000000 +0100
***************
*** 716,717 ****
--- 716,719 ----
{ /* Add new patch number below this line */
+ /**/
+ 472,
/**/
--
hundred-and-one symptoms of being an internet addict:
200. You really believe in the concept of a "paperless" office.
/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\ an exciting new programming language -- http://www.Zimbu.org ///
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///

68
7.3.473 Normal file
View File

@ -0,0 +1,68 @@
To: vim_dev@googlegroups.com
Subject: Patch 7.3.473
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------
Patch 7.3.473
Problem: 'cursorbind' does not work correctly in combination with
'virtualedit' set to "all".
Solution: Copy coladd. (Gary Johnson)
Files: src/move.c
*** ../vim-7.3.472/src/move.c 2012-02-04 23:34:57.000000000 +0100
--- src/move.c 2012-03-16 19:20:57.000000000 +0100
***************
*** 2843,2849 ****
do_check_cursorbind()
{
linenr_T line = curwin->w_cursor.lnum;
! colnr_T col = curwin->w_cursor.col;
win_T *old_curwin = curwin;
buf_T *old_curbuf = curbuf;
int restart_edit_save;
--- 2843,2852 ----
do_check_cursorbind()
{
linenr_T line = curwin->w_cursor.lnum;
! colnr_T col = curwin->w_cursor.col;
! # ifdef FEAT_VIRTUALEDIT
! colnr_T coladd = curwin->w_cursor.coladd;
! # endif
win_T *old_curwin = curwin;
buf_T *old_curbuf = curbuf;
int restart_edit_save;
***************
*** 2875,2880 ****
--- 2878,2886 ----
# endif
curwin->w_cursor.lnum = line;
curwin->w_cursor.col = col;
+ # ifdef FEAT_VIRTUALEDIT
+ curwin->w_cursor.coladd = coladd;
+ # endif
/* Make sure the cursor is in a valid position. Temporarily set
* "restart_edit" to allow the cursor to be beyond the EOL. */
*** ../vim-7.3.472/src/version.c 2012-03-16 19:07:54.000000000 +0100
--- src/version.c 2012-03-16 19:24:06.000000000 +0100
***************
*** 716,717 ****
--- 716,719 ----
{ /* Add new patch number below this line */
+ /**/
+ 473,
/**/
--
hundred-and-one symptoms of being an internet addict:
201. When somebody asks you where you are, you tell them in which chat room.
/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\ an exciting new programming language -- http://www.Zimbu.org ///
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///

62
7.3.474 Normal file
View File

@ -0,0 +1,62 @@
To: vim_dev@googlegroups.com
Subject: Patch 7.3.474
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------
Patch 7.3.474
Problem: Perl build with gcc 4 fails.
Solution: Remove XS() statements. (Yasuhiro Matsumoto)
Files: src/if_perl.xs
*** ../vim-7.3.473/src/if_perl.xs 2012-02-12 00:31:47.000000000 +0100
--- src/if_perl.xs 2012-03-16 19:33:23.000000000 +0100
***************
*** 913,936 ****
win_T *win_find_nr(int n) { return curwin; }
#endif
- XS(XS_VIM_Msg);
- XS(XS_VIM_SetOption);
- XS(XS_VIM_DoCommand);
- XS(XS_VIM_Eval);
- XS(XS_VIM_Buffers);
- XS(XS_VIM_Windows);
- XS(XS_VIWIN_DESTROY);
- XS(XS_VIWIN_Buffer);
- XS(XS_VIWIN_SetHeight);
- XS(XS_VIWIN_Cursor);
- XS(XS_VIBUF_DESTROY);
- XS(XS_VIBUF_Name);
- XS(XS_VIBUF_Number);
- XS(XS_VIBUF_Count);
- XS(XS_VIBUF_Get);
- XS(XS_VIBUF_Set);
- XS(XS_VIBUF_Delete);
- XS(XS_VIBUF_Append);
XS(boot_VIM);
static void
--- 913,918 ----
*** ../vim-7.3.473/src/version.c 2012-03-16 19:24:21.000000000 +0100
--- src/version.c 2012-03-16 19:28:03.000000000 +0100
***************
*** 716,717 ****
--- 716,719 ----
{ /* Add new patch number below this line */
+ /**/
+ 474,
/**/
--
hundred-and-one symptoms of being an internet addict:
202. You're amazed to find out Spam is a food.
/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\ an exciting new programming language -- http://www.Zimbu.org ///
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///

98
7.3.475 Normal file
View File

@ -0,0 +1,98 @@
To: vim_dev@googlegroups.com
Subject: Patch 7.3.475
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------
Patch 7.3.475
Problem: In a terminal with few colors the omnicomplete menu may be hard to
see when using the default colors.
Solution: Use more explicit colors. (suggested by Alex Henrie)
Files: src/syntax.c
*** ../vim-7.3.474/src/syntax.c 2012-01-10 22:26:12.000000000 +0100
--- src/syntax.c 2012-03-16 20:14:22.000000000 +0100
***************
*** 6516,6523 ****
"DiffText term=reverse cterm=bold ctermbg=Red gui=bold guibg=Red"),
#endif
#ifdef FEAT_INS_EXPAND
- CENT("PmenuThumb cterm=reverse",
- "PmenuThumb cterm=reverse gui=reverse"),
CENT("PmenuSbar ctermbg=Grey",
"PmenuSbar ctermbg=Grey guibg=Grey"),
#endif
--- 6516,6521 ----
***************
*** 6557,6566 ****
"SpellLocal term=underline ctermbg=Cyan guisp=DarkCyan gui=undercurl"),
#endif
#ifdef FEAT_INS_EXPAND
! CENT("Pmenu ctermbg=LightMagenta",
! "Pmenu ctermbg=LightMagenta guibg=LightMagenta"),
! CENT("PmenuSel ctermbg=LightGrey",
! "PmenuSel ctermbg=LightGrey guibg=Grey"),
#endif
CENT("SpecialKey term=bold ctermfg=DarkBlue",
"SpecialKey term=bold ctermfg=DarkBlue guifg=Blue"),
--- 6555,6566 ----
"SpellLocal term=underline ctermbg=Cyan guisp=DarkCyan gui=undercurl"),
#endif
#ifdef FEAT_INS_EXPAND
! CENT("PmenuThumb ctermbg=Black",
! "PmenuThumb ctermbg=Black guibg=Black"),
! CENT("Pmenu ctermbg=LightMagenta ctermfg=Black",
! "Pmenu ctermbg=LightMagenta ctermfg=Black guibg=LightMagenta"),
! CENT("PmenuSel ctermbg=LightGrey ctermfg=Black",
! "PmenuSel ctermbg=LightGrey ctermfg=Black guibg=Grey"),
#endif
CENT("SpecialKey term=bold ctermfg=DarkBlue",
"SpecialKey term=bold ctermfg=DarkBlue guifg=Blue"),
***************
*** 6645,6654 ****
"SpellLocal term=underline ctermbg=Cyan guisp=Cyan gui=undercurl"),
#endif
#ifdef FEAT_INS_EXPAND
! CENT("Pmenu ctermbg=Magenta",
! "Pmenu ctermbg=Magenta guibg=Magenta"),
! CENT("PmenuSel ctermbg=DarkGrey",
! "PmenuSel ctermbg=DarkGrey guibg=DarkGrey"),
#endif
CENT("Title term=bold ctermfg=LightMagenta",
"Title term=bold ctermfg=LightMagenta gui=bold guifg=Magenta"),
--- 6645,6656 ----
"SpellLocal term=underline ctermbg=Cyan guisp=Cyan gui=undercurl"),
#endif
#ifdef FEAT_INS_EXPAND
! CENT("PmenuThumb ctermbg=White",
! "PmenuThumb ctermbg=White guibg=White"),
! CENT("Pmenu ctermbg=Magenta ctermfg=Black",
! "Pmenu ctermbg=Magenta ctermfg=Black guibg=Magenta"),
! CENT("PmenuSel ctermbg=DarkGrey ctermfg=Black",
! "PmenuSel ctermbg=DarkGrey ctermfg=Black guibg=DarkGrey"),
#endif
CENT("Title term=bold ctermfg=LightMagenta",
"Title term=bold ctermfg=LightMagenta gui=bold guifg=Magenta"),
*** ../vim-7.3.474/src/version.c 2012-03-16 19:34:43.000000000 +0100
--- src/version.c 2012-03-16 20:05:35.000000000 +0100
***************
*** 716,717 ****
--- 716,719 ----
{ /* Add new patch number below this line */
+ /**/
+ 475,
/**/
--
Spam seems to be something useful to novices. Later you realize that
it's a bunch of indigestable junk that only clogs your system.
Applies to both the food and the e-mail!
/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\ an exciting new programming language -- http://www.Zimbu.org ///
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///

56
7.3.476 Normal file
View File

@ -0,0 +1,56 @@
To: vim_dev@googlegroups.com
Subject: Patch 7.3.476
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------
Patch 7.3.476
Problem: When selecting a block, using "$" to include the end of each line
and using "A" and typing a backspace strange things happen.
(Yuangchen Xie)
Solution: Avoid using a negative length. (Christian Brabandt)
Files: src/ops.c
*** ../vim-7.3.475/src/ops.c 2012-03-07 19:30:32.000000000 +0100
--- src/ops.c 2012-03-23 12:22:36.000000000 +0100
***************
*** 2602,2608 ****
firstline = ml_get(oap->start.lnum) + bd.textcol;
if (oap->op_type == OP_APPEND)
firstline += bd.textlen;
! if ((ins_len = (long)STRLEN(firstline) - pre_textlen) > 0)
{
ins_text = vim_strnsave(firstline, (int)ins_len);
if (ins_text != NULL)
--- 2602,2609 ----
firstline = ml_get(oap->start.lnum) + bd.textcol;
if (oap->op_type == OP_APPEND)
firstline += bd.textlen;
! if (pre_textlen >= 0
! && (ins_len = (long)STRLEN(firstline) - pre_textlen) > 0)
{
ins_text = vim_strnsave(firstline, (int)ins_len);
if (ins_text != NULL)
*** ../vim-7.3.475/src/version.c 2012-03-16 20:16:42.000000000 +0100
--- src/version.c 2012-03-23 14:14:49.000000000 +0100
***************
*** 716,717 ****
--- 716,719 ----
{ /* Add new patch number below this line */
+ /**/
+ 476,
/**/
--
"Marriage is a wonderful institution...
but who wants to live in an institution?"
- Groucho Marx
/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\ an exciting new programming language -- http://www.Zimbu.org ///
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///

52
7.3.477 Normal file
View File

@ -0,0 +1,52 @@
To: vim_dev@googlegroups.com
Subject: Patch 7.3.477
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------
Patch 7.3.477
Problem: Using ":echo" to output enough lines to scroll, then using "j" and
"k" at the more prompt, displays the command on top of the output.
(Marcin Szamotulski)
Solution: Put the output below the command. (Christian Brabandt)
Files: src/eval.c
*** ../vim-7.3.476/src/eval.c 2012-03-07 19:16:49.000000000 +0100
--- src/eval.c 2012-03-23 15:11:30.000000000 +0100
***************
*** 20492,20498 ****
--- 20492,20503 ----
/* Call msg_start() after eval1(), evaluating the expression
* may cause a message to appear. */
if (eap->cmdidx == CMD_echo)
+ {
+ /* Put the output below the command, makes scrolling back
+ * at more prompt work. */
+ msg_didout = TRUE;
msg_start();
+ }
}
else if (eap->cmdidx == CMD_echo)
msg_puts_attr((char_u *)" ", echo_attr);
*** ../vim-7.3.476/src/version.c 2012-03-23 14:16:19.000000000 +0100
--- src/version.c 2012-03-23 15:13:58.000000000 +0100
***************
*** 716,717 ****
--- 716,719 ----
{ /* Add new patch number below this line */
+ /**/
+ 477,
/**/
--
"Marriage is when a man and woman become as one; the trouble starts
when they try to decide which one"
/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\ an exciting new programming language -- http://www.Zimbu.org ///
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///

46
7.3.478 Normal file
View File

@ -0,0 +1,46 @@
To: vim_dev@googlegroups.com
Subject: Patch 7.3.478
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------
Patch 7.3.478
Problem: Memory leak using the ':rv!' command when reading dictionary or
list global variables i.e. with 'viminfo' containing !.
Solution: Free the typeval. (Dominique Pelle)
Files: src/eval.c
*** ../vim-7.3.477/src/eval.c 2012-03-23 15:18:20.000000000 +0100
--- src/eval.c 2012-03-23 15:28:42.000000000 +0100
***************
*** 22976,22981 ****
--- 22976,22982 ----
{
vim_free(tv.vval.v_string);
tv = *etv;
+ vim_free(etv);
}
}
*** ../vim-7.3.477/src/version.c 2012-03-23 15:18:20.000000000 +0100
--- src/version.c 2012-03-23 15:29:22.000000000 +0100
***************
*** 716,717 ****
--- 716,719 ----
{ /* Add new patch number below this line */
+ /**/
+ 478,
/**/
--
"Marriage is the process of finding out what kind of man your wife
would have preferred"
/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\ an exciting new programming language -- http://www.Zimbu.org ///
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///

134
7.3.479 Normal file
View File

@ -0,0 +1,134 @@
To: vim_dev@googlegroups.com
Subject: Patch 7.3.479
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------
Patch 7.3.479
Problem: When 'cursorline' is set the line number highlighting can't be set
separately.
Solution: Add "CursorLineNr". (Howard Buchholz)
Files: src/option.c, src/screen.c, src/syntax.c, src/vim.h
*** ../vim-7.3.478/src/option.c 2012-02-29 13:51:32.000000000 +0100
--- src/option.c 2012-03-23 15:44:57.000000000 +0100
***************
*** 460,468 ****
#if defined(FEAT_DIFF) || defined(FEAT_FOLDING) || defined(FEAT_SPELL) \
|| defined(FEAT_VERTSPLIT) || defined(FEAT_CLIPBOARD) \
|| defined(FEAT_INS_EXPAND) || defined(FEAT_SYN_HL) || defined(FEAT_CONCEAL)
! # define HIGHLIGHT_INIT "8:SpecialKey,@:NonText,d:Directory,e:ErrorMsg,i:IncSearch,l:Search,m:MoreMsg,M:ModeMsg,n:LineNr,r:Question,s:StatusLine,S:StatusLineNC,c:VertSplit,t:Title,v:Visual,V:VisualNOS,w:WarningMsg,W:WildMenu,f:Folded,F:FoldColumn,A:DiffAdd,C:DiffChange,D:DiffDelete,T:DiffText,>:SignColumn,-:Conceal,B:SpellBad,P:SpellCap,R:SpellRare,L:SpellLocal,+:Pmenu,=:PmenuSel,x:PmenuSbar,X:PmenuThumb,*:TabLine,#:TabLineSel,_:TabLineFill,!:CursorColumn,.:CursorLine,o:ColorColumn"
#else
! # define HIGHLIGHT_INIT "8:SpecialKey,@:NonText,d:Directory,e:ErrorMsg,i:IncSearch,l:Search,m:MoreMsg,M:ModeMsg,n:LineNr,r:Question,s:StatusLine,S:StatusLineNC,t:Title,v:Visual,w:WarningMsg,W:WildMenu,>:SignColumn,*:TabLine,#:TabLineSel,_:TabLineFill"
#endif
/*
--- 460,468 ----
#if defined(FEAT_DIFF) || defined(FEAT_FOLDING) || defined(FEAT_SPELL) \
|| defined(FEAT_VERTSPLIT) || defined(FEAT_CLIPBOARD) \
|| defined(FEAT_INS_EXPAND) || defined(FEAT_SYN_HL) || defined(FEAT_CONCEAL)
! # define HIGHLIGHT_INIT "8:SpecialKey,@:NonText,d:Directory,e:ErrorMsg,i:IncSearch,l:Search,m:MoreMsg,M:ModeMsg,n:LineNr,N:CursorLineNr,r:Question,s:StatusLine,S:StatusLineNC,c:VertSplit,t:Title,v:Visual,V:VisualNOS,w:WarningMsg,W:WildMenu,f:Folded,F:FoldColumn,A:DiffAdd,C:DiffChange,D:DiffDelete,T:DiffText,>:SignColumn,-:Conceal,B:SpellBad,P:SpellCap,R:SpellRare,L:SpellLocal,+:Pmenu,=:PmenuSel,x:PmenuSbar,X:PmenuThumb,*:TabLine,#:TabLineSel,_:TabLineFill,!:CursorColumn,.:CursorLine,o:ColorColumn"
#else
! # define HIGHLIGHT_INIT "8:SpecialKey,@:NonText,d:Directory,e:ErrorMsg,i:IncSearch,l:Search,m:MoreMsg,M:ModeMsg,n:LineNr,N:CursorLineNr,r:Question,s:StatusLine,S:StatusLineNC,t:Title,v:Visual,w:WarningMsg,W:WildMenu,>:SignColumn,*:TabLine,#:TabLineSel,_:TabLineFill"
#endif
/*
*** ../vim-7.3.478/src/screen.c 2012-03-16 19:07:54.000000000 +0100
--- src/screen.c 2012-03-23 16:09:15.000000000 +0100
***************
*** 3501,3509 ****
char_attr = hl_attr(HLF_N);
#ifdef FEAT_SYN_HL
/* When 'cursorline' is set highlight the line number of
! * the current line differently. */
if (wp->w_p_cul && lnum == wp->w_cursor.lnum)
! char_attr = hl_combine_attr(hl_attr(HLF_CUL), char_attr);
#endif
}
}
--- 3501,3511 ----
char_attr = hl_attr(HLF_N);
#ifdef FEAT_SYN_HL
/* When 'cursorline' is set highlight the line number of
! * the current line differently.
! * TODO: Can we use CursorLine instead of CursorLineNr
! * when CursorLineNr isn't set? */
if (wp->w_p_cul && lnum == wp->w_cursor.lnum)
! char_attr = hl_attr(HLF_CLN);
#endif
}
}
*** ../vim-7.3.478/src/syntax.c 2012-03-16 20:16:42.000000000 +0100
--- src/syntax.c 2012-03-23 16:23:57.000000000 +0100
***************
*** 6538,6543 ****
--- 6538,6545 ----
"Directory term=bold ctermfg=DarkBlue guifg=Blue"),
CENT("LineNr term=underline ctermfg=Brown",
"LineNr term=underline ctermfg=Brown guifg=Brown"),
+ CENT("CursorLineNr term=bold ctermfg=Brown",
+ "CursorLineNr term=bold ctermfg=Brown gui=bold guifg=Brown"),
CENT("MoreMsg term=bold ctermfg=DarkGreen",
"MoreMsg term=bold ctermfg=DarkGreen gui=bold guifg=SeaGreen"),
CENT("Question term=standout ctermfg=DarkGreen",
***************
*** 6626,6631 ****
--- 6628,6635 ----
"Directory term=bold ctermfg=LightCyan guifg=Cyan"),
CENT("LineNr term=underline ctermfg=Yellow",
"LineNr term=underline ctermfg=Yellow guifg=Yellow"),
+ CENT("CursorLineNr term=bold ctermfg=Yellow",
+ "CursorLineNr term=bold ctermfg=Yellow gui=bold guifg=Yellow"),
CENT("MoreMsg term=bold ctermfg=LightGreen",
"MoreMsg term=bold ctermfg=LightGreen gui=bold guifg=SeaGreen"),
CENT("Question term=standout ctermfg=LightGreen",
*** ../vim-7.3.478/src/vim.h 2012-03-07 19:16:49.000000000 +0100
--- src/vim.h 2012-03-23 15:44:57.000000000 +0100
***************
*** 1318,1323 ****
--- 1318,1324 ----
, HLF_M /* "--More--" message */
, HLF_CM /* Mode (e.g., "-- INSERT --") */
, HLF_N /* line number for ":number" and ":#" commands */
+ , HLF_CLN /* current line number */
, HLF_R /* return to continue message and yes/no questions */
, HLF_S /* status lines */
, HLF_SNC /* status lines of not-current windows */
***************
*** 1355,1361 ****
/* The HL_FLAGS must be in the same order as the HLF_ enums!
* When changing this also adjust the default for 'highlight'. */
#define HL_FLAGS {'8', '@', 'd', 'e', 'h', 'i', 'l', 'm', 'M', \
! 'n', 'r', 's', 'S', 'c', 't', 'v', 'V', 'w', 'W', \
'f', 'F', 'A', 'C', 'D', 'T', '-', '>', \
'B', 'P', 'R', 'L', \
'+', '=', 'x', 'X', '*', '#', '_', '!', '.', 'o'}
--- 1356,1362 ----
/* The HL_FLAGS must be in the same order as the HLF_ enums!
* When changing this also adjust the default for 'highlight'. */
#define HL_FLAGS {'8', '@', 'd', 'e', 'h', 'i', 'l', 'm', 'M', \
! 'n', 'N', 'r', 's', 'S', 'c', 't', 'v', 'V', 'w', 'W', \
'f', 'F', 'A', 'C', 'D', 'T', '-', '>', \
'B', 'P', 'R', 'L', \
'+', '=', 'x', 'X', '*', '#', '_', '!', '.', 'o'}
*** ../vim-7.3.478/src/version.c 2012-03-23 15:36:57.000000000 +0100
--- src/version.c 2012-03-23 16:16:41.000000000 +0100
***************
*** 716,717 ****
--- 716,719 ----
{ /* Add new patch number below this line */
+ /**/
+ 479,
/**/
--
If you're sending someone Styrofoam, what do you pack it in?
/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\ an exciting new programming language -- http://www.Zimbu.org ///
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///

237
7.3.480 Normal file
View File

@ -0,0 +1,237 @@
To: vim_dev@googlegroups.com
Subject: Patch 7.3.480
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------
Patch 7.3.480
Problem: When using ":qa" and there is a changed buffer picking the buffer
to jump to is not very good.
Solution: Consider current and other tab pages. (Hirohito Higashi)
Files: src/ex_cmds2.c
*** ../vim-7.3.479/src/ex_cmds2.c 2012-02-22 18:29:29.000000000 +0100
--- src/ex_cmds2.c 2012-03-23 17:01:31.000000000 +0100
***************
*** 1569,1574 ****
--- 1569,1594 ----
|| forceit);
}
+ static void add_bufnum __ARGS((int *bufnrs, int *bufnump, int nr));
+
+ /*
+ * Add a buffer number to "bufnrs", unless it's already there.
+ */
+ static void
+ add_bufnum(bufnrs, bufnump, nr)
+ int *bufnrs;
+ int *bufnump;
+ int nr;
+ {
+ int i;
+
+ for (i = 0; i < *bufnump; ++i)
+ if (bufnrs[i] == nr)
+ return;
+ bufnrs[*bufnump] = nr;
+ *bufnump = *bufnump + 1;
+ }
+
/*
* Return TRUE if any buffer was changed and cannot be abandoned.
* That changed buffer becomes the current buffer.
***************
*** 1577,1608 ****
check_changed_any(hidden)
int hidden; /* Only check hidden buffers */
{
buf_T *buf;
int save;
#ifdef FEAT_WINDOWS
win_T *wp;
#endif
! for (;;)
{
! /* check curbuf first: if it was changed we can't abandon it */
! if (!hidden && curbufIsChanged())
! buf = curbuf;
! else
{
! for (buf = firstbuf; buf != NULL; buf = buf->b_next)
! if ((!hidden || buf->b_nwindows == 0) && bufIsChanged(buf))
! break;
}
- if (buf == NULL) /* No buffers changed */
- return FALSE;
-
- /* Try auto-writing the buffer. If this fails but the buffer no
- * longer exists it's not changed, that's OK. */
- if (check_changed(buf, p_awa, TRUE, FALSE, TRUE) && buf_valid(buf))
- break; /* didn't save - still changes */
}
exiting = FALSE;
#if defined(FEAT_GUI_DIALOG) || defined(FEAT_CON_DIALOG)
/*
--- 1597,1660 ----
check_changed_any(hidden)
int hidden; /* Only check hidden buffers */
{
+ int ret = FALSE;
buf_T *buf;
int save;
+ int i;
+ int bufnum = 0;
+ int bufcount = 0;
+ int *bufnrs;
#ifdef FEAT_WINDOWS
+ tabpage_T *tp;
win_T *wp;
#endif
! for (buf = firstbuf; buf != NULL; buf = buf->b_next)
! ++bufcount;
!
! if (bufcount == 0)
! return FALSE;
!
! bufnrs = (int *)alloc(sizeof(int) * bufcount);
! if (bufnrs == NULL)
! return FALSE;
!
! /* curbuf */
! bufnrs[bufnum++] = curbuf->b_fnum;
! #ifdef FEAT_WINDOWS
! /* buf in curtab */
! FOR_ALL_WINDOWS(wp)
! if (wp->w_buffer != curbuf)
! add_bufnum(bufnrs, &bufnum, wp->w_buffer->b_fnum);
!
! /* buf in other tab */
! for (tp = first_tabpage; tp != NULL; tp = tp->tp_next)
! if (tp != curtab)
! for (wp = tp->tp_firstwin; wp != NULL; wp = wp->w_next)
! add_bufnum(bufnrs, &bufnum, wp->w_buffer->b_fnum);
! #endif
! /* any other buf */
! for (buf = firstbuf; buf != NULL; buf = buf->b_next)
! add_bufnum(bufnrs, &bufnum, buf->b_fnum);
!
! for (i = 0; i < bufnum; ++i)
{
! buf = buflist_findnr(bufnrs[i]);
! if (buf == NULL)
! continue;
! if ((!hidden || buf->b_nwindows == 0) && bufIsChanged(buf))
{
! /* Try auto-writing the buffer. If this fails but the buffer no
! * longer exists it's not changed, that's OK. */
! if (check_changed(buf, p_awa, TRUE, FALSE, TRUE) && buf_valid(buf))
! break; /* didn't save - still changes */
}
}
+ if (i >= bufnum)
+ goto theend;
+
+ ret = TRUE;
exiting = FALSE;
#if defined(FEAT_GUI_DIALOG) || defined(FEAT_CON_DIALOG)
/*
***************
*** 1635,1658 ****
#ifdef FEAT_WINDOWS
/* Try to find a window that contains the buffer. */
if (buf != curbuf)
! for (wp = firstwin; wp != NULL; wp = wp->w_next)
if (wp->w_buffer == buf)
{
! win_goto(wp);
# ifdef FEAT_AUTOCMD
/* Paranoia: did autocms wipe out the buffer with changes? */
if (!buf_valid(buf))
! return TRUE;
# endif
! break;
}
#endif
/* Open the changed buffer in the current window. */
if (buf != curbuf)
set_curbuf(buf, DOBUF_GOTO);
! return TRUE;
}
/*
--- 1687,1715 ----
#ifdef FEAT_WINDOWS
/* Try to find a window that contains the buffer. */
if (buf != curbuf)
! FOR_ALL_TAB_WINDOWS(tp, wp)
if (wp->w_buffer == buf)
{
! goto_tabpage_win(tp, wp);
# ifdef FEAT_AUTOCMD
/* Paranoia: did autocms wipe out the buffer with changes? */
if (!buf_valid(buf))
! {
! goto theend;
! }
# endif
! goto buf_found;
}
+ buf_found:
#endif
/* Open the changed buffer in the current window. */
if (buf != curbuf)
set_curbuf(buf, DOBUF_GOTO);
! theend:
! vim_free(bufnrs);
! return ret;
}
/*
***************
*** 3274,3280 ****
home_replace(NULL, SCRIPT_ITEM(i).sn_name,
NameBuff, MAXPATHL, TRUE);
smsg((char_u *)"%3d: %s", i, NameBuff);
! }
}
# if defined(BACKSLASH_IN_FILENAME) || defined(PROTO)
--- 3331,3337 ----
home_replace(NULL, SCRIPT_ITEM(i).sn_name,
NameBuff, MAXPATHL, TRUE);
smsg((char_u *)"%3d: %s", i, NameBuff);
! }
}
# if defined(BACKSLASH_IN_FILENAME) || defined(PROTO)
*** ../vim-7.3.479/src/version.c 2012-03-23 16:25:13.000000000 +0100
--- src/version.c 2012-03-23 16:48:06.000000000 +0100
***************
*** 716,717 ****
--- 716,719 ----
{ /* Add new patch number below this line */
+ /**/
+ 480,
/**/
--
hundred-and-one symptoms of being an internet addict:
243. You unsuccessfully try to download a pizza from www.dominos.com.
/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\ an exciting new programming language -- http://www.Zimbu.org ///
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///

65
7.3.481 Normal file
View File

@ -0,0 +1,65 @@
To: vim_dev@googlegroups.com
Subject: Patch 7.3.481
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------
Patch 7.3.481
Problem: Changing 'virtualedit' in an operator function to "all" does not
have the desired effect. (Aaron Bohannon)
Solution: Save, reset and restore virtual_op when executing an operator
function.
Files: src/normal.c
*** ../vim-7.3.480/src/normal.c 2012-02-05 01:18:41.000000000 +0100
--- src/normal.c 2012-03-28 12:59:46.000000000 +0200
***************
*** 2279,2284 ****
--- 2279,2285 ----
{
#ifdef FEAT_EVAL
char_u *(argv[1]);
+ int save_virtual_op = virtual_op;
if (*p_opfunc == NUL)
EMSG(_("E774: 'operatorfunc' is empty"));
***************
*** 2297,2303 ****
--- 2298,2311 ----
argv[0] = (char_u *)"line";
else
argv[0] = (char_u *)"char";
+
+ /* Reset virtual_op so that 'virtualedit' can be changed in the
+ * function. */
+ virtual_op = MAYBE;
+
(void)call_func_retnr(p_opfunc, 1, argv, FALSE);
+
+ virtual_op = save_virtual_op;
}
#else
EMSG(_("E775: Eval feature not available"));
*** ../vim-7.3.480/src/version.c 2012-03-23 18:39:10.000000000 +0100
--- src/version.c 2012-03-28 12:50:20.000000000 +0200
***************
*** 716,717 ****
--- 716,719 ----
{ /* Add new patch number below this line */
+ /**/
+ 481,
/**/
--
hundred-and-one symptoms of being an internet addict:
269. You wonder how you can make your dustbin produce Sesame Street's
Oscar's the Garbage Monster song when you empty it.
/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\ an exciting new programming language -- http://www.Zimbu.org ///
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///

57
7.3.482 Normal file
View File

@ -0,0 +1,57 @@
To: vim_dev@googlegroups.com
Subject: Patch 7.3.482
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------
Patch 7.3.482
Problem: With 'cursorbind' set moving up/down does not always keep the same
column.
Solution: Set curswant appropriately. (Gary Johnson)
Files: src/move.c
*** ../vim-7.3.481/src/move.c 2012-03-16 19:24:21.000000000 +0100
--- src/move.c 2012-03-28 14:16:02.000000000 +0200
***************
*** 2847,2852 ****
--- 2847,2854 ----
# ifdef FEAT_VIRTUALEDIT
colnr_T coladd = curwin->w_cursor.coladd;
# endif
+ colnr_T curswant = curwin->w_curswant;
+ int set_curswant = curwin->w_set_curswant;
win_T *old_curwin = curwin;
buf_T *old_curbuf = curbuf;
int restart_edit_save;
***************
*** 2881,2886 ****
--- 2883,2890 ----
# ifdef FEAT_VIRTUALEDIT
curwin->w_cursor.coladd = coladd;
# endif
+ curwin->w_curswant = curswant;
+ curwin->w_set_curswant = set_curswant;
/* Make sure the cursor is in a valid position. Temporarily set
* "restart_edit" to allow the cursor to be beyond the EOL. */
*** ../vim-7.3.481/src/version.c 2012-03-28 12:59:53.000000000 +0200
--- src/version.c 2012-03-28 14:15:56.000000000 +0200
***************
*** 716,717 ****
--- 716,719 ----
{ /* Add new patch number below this line */
+ /**/
+ 482,
/**/
--
Women are probably the main cause of free software starvation.
/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\ an exciting new programming language -- http://www.Zimbu.org ///
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///

97
7.3.483 Normal file
View File

@ -0,0 +1,97 @@
To: vim_dev@googlegroups.com
Subject: Patch 7.3.483
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------
Patch 7.3.483 (after 7.3.477)
Problem: More prompt shows up too often.
Solution: Instead of adding a line break, only start a new line in the
message history. (Christian Brabandt)
Files: src/eval.c, src/message.c, src/proto/message.pro
*** ../vim-7.3.482/src/eval.c 2012-03-23 15:36:57.000000000 +0100
--- src/eval.c 2012-03-28 16:41:03.000000000 +0200
***************
*** 20493,20501 ****
* may cause a message to appear. */
if (eap->cmdidx == CMD_echo)
{
! /* Put the output below the command, makes scrolling back
! * at more prompt work. */
! msg_didout = TRUE;
msg_start();
}
}
--- 20493,20502 ----
* may cause a message to appear. */
if (eap->cmdidx == CMD_echo)
{
! /* Mark the saved text as finishing the line, so that what
! * follows is displayed on a new line when scrolling back
! * at the more prompt. */
! msg_sb_eol();
msg_start();
}
}
*** ../vim-7.3.482/src/message.c 2012-01-26 13:01:54.000000000 +0100
--- src/message.c 2012-03-28 16:35:26.000000000 +0200
***************
*** 2348,2353 ****
--- 2348,2363 ----
}
/*
+ * Mark the last message chunk as finishing the line.
+ */
+ void
+ msg_sb_eol()
+ {
+ if (last_msgchunk != NULL)
+ last_msgchunk->sb_eol = TRUE;
+ }
+
+ /*
* Display a screen line from previously displayed text at row "row".
* Returns a pointer to the text for the next line (can be NULL).
*/
*** ../vim-7.3.482/src/proto/message.pro 2012-01-20 20:44:38.000000000 +0100
--- src/proto/message.pro 2012-03-28 16:35:33.000000000 +0200
***************
*** 45,50 ****
--- 45,51 ----
void may_clear_sb_text __ARGS((void));
void clear_sb_text __ARGS((void));
void show_sb_text __ARGS((void));
+ void msg_sb_eol __ARGS((void));
int msg_use_printf __ARGS((void));
void mch_errmsg __ARGS((char *str));
void mch_msg __ARGS((char *str));
*** ../vim-7.3.482/src/version.c 2012-03-28 14:19:46.000000000 +0200
--- src/version.c 2012-03-28 16:48:53.000000000 +0200
***************
*** 716,717 ****
--- 716,719 ----
{ /* Add new patch number below this line */
+ /**/
+ 483,
/**/
--
We're knights of the Round Table
Our shows are formidable
But many times
We're given rhymes
That are quite unsingable
We're opera mad in Camelot
We sing from the diaphragm a lot.
"Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD
/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\ an exciting new programming language -- http://www.Zimbu.org ///
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///

62
7.3.484 Normal file
View File

@ -0,0 +1,62 @@
To: vim_dev@googlegroups.com
Subject: Patch 7.3.484
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------
Patch 7.3.484
Problem: The -E and --echo-wid command line arguments are not mentioned in
"vim --help".
Solution: Add the help lines. (Dominique Pelle)
Files: src/main.c
*** ../vim-7.3.483/src/main.c 2012-02-12 01:55:50.000000000 +0100
--- src/main.c 2012-03-28 16:55:03.000000000 +0200
***************
*** 3181,3186 ****
--- 3181,3187 ----
#endif
main_msg(_("-v\t\t\tVi mode (like \"vi\")"));
main_msg(_("-e\t\t\tEx mode (like \"ex\")"));
+ main_msg(_("-E\t\t\tImproved Ex mode"));
main_msg(_("-s\t\t\tSilent (batch) mode (only for \"ex\")"));
#ifdef FEAT_DIFF
main_msg(_("-d\t\t\tDiff mode (like \"vimdiff\")"));
***************
*** 3304,3309 ****
--- 3305,3311 ----
main_msg(_("-display <display>\tRun vim on <display> (also: --display)"));
main_msg(_("--role <role>\tSet a unique role to identify the main window"));
main_msg(_("--socketid <xid>\tOpen Vim inside another GTK widget"));
+ main_msg(_("--echo-wid\t\tMake gvim echo the Window ID on stdout"));
#endif
#ifdef FEAT_GUI_W32
main_msg(_("-P <parent title>\tOpen Vim inside parent application"));
*** ../vim-7.3.483/src/version.c 2012-03-28 16:49:25.000000000 +0200
--- src/version.c 2012-03-28 17:10:08.000000000 +0200
***************
*** 716,717 ****
--- 716,719 ----
{ /* Add new patch number below this line */
+ /**/
+ 484,
/**/
--
In war we're tough and able.
Quite indefatigable
Between our quests
We sequin vests
And impersonate Clark Gable
It's a busy life in Camelot.
I have to push the pram a lot.
"Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD
/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\ an exciting new programming language -- http://www.Zimbu.org ///
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///

52
7.3.485 Normal file
View File

@ -0,0 +1,52 @@
To: vim_dev@googlegroups.com
Subject: Patch 7.3.485
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------
Patch 7.3.485
Problem: When building Vim LDFLAGS isn't passed on to building xxd.
Solution: Pass the LDFLAGS value. (James McCoy)
Files: src/Makefile
*** ../vim-7.3.484/src/Makefile 2011-12-14 20:51:19.000000000 +0100
--- src/Makefile 2012-03-28 17:16:06.000000000 +0200
***************
*** 1720,1726 ****
sh $(srcdir)/link.sh
xxd/xxd$(EXEEXT): xxd/xxd.c
! cd xxd; CC="$(CC)" CFLAGS="$(CPPFLAGS) $(CFLAGS)" \
$(MAKE) -f Makefile
# Build the language specific files if they were unpacked.
--- 1720,1726 ----
sh $(srcdir)/link.sh
xxd/xxd$(EXEEXT): xxd/xxd.c
! cd xxd; CC="$(CC)" CFLAGS="$(CPPFLAGS) $(CFLAGS)" LDFLAGS="$(LDFLAGS)" \
$(MAKE) -f Makefile
# Build the language specific files if they were unpacked.
*** ../vim-7.3.484/src/version.c 2012-03-28 17:10:26.000000000 +0200
--- src/version.c 2012-03-28 17:16:15.000000000 +0200
***************
*** 716,717 ****
--- 716,719 ----
{ /* Add new patch number below this line */
+ /**/
+ 485,
/**/
--
GOD: That is your purpose Arthur ... the Quest for the Holy Grail ...
"Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD
/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\ an exciting new programming language -- http://www.Zimbu.org ///
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///

58
7.3.486 Normal file
View File

@ -0,0 +1,58 @@
To: vim_dev@googlegroups.com
Subject: Patch 7.3.486
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------
Patch 7.3.486
Problem: Build error with mingw64 on Windows 7.
Solution: Avoid the step of going through vimres.res. (Guopeng Wen)
Files: src/Make_ming.mak
*** ../vim-7.3.485/src/Make_ming.mak 2012-02-29 16:56:35.000000000 +0100
--- src/Make_ming.mak 2012-03-28 17:41:55.000000000 +0200
***************
*** 681,691 ****
$(OUTDIR)/%.o : %.c $(INCL)
$(CC) -c $(CFLAGS) $< -o $@
! $(OUTDIR)/vimres.res: vim.rc version.h gui_w32_rc.h
! $(WINDRES) $(WINDRES_FLAGS) $(DEFINES) vim.rc $(OUTDIR)/vimres.res
!
! $(OUTDIR)/vimrc.o: $(OUTDIR)/vimres.res
! $(WINDRES) $(WINDRES_FLAGS) $(OUTDIR)/vimres.res $(OUTDIR)/vimrc.o
$(OUTDIR):
$(MKDIR) $(OUTDIR)
--- 681,689 ----
$(OUTDIR)/%.o : %.c $(INCL)
$(CC) -c $(CFLAGS) $< -o $@
! $(OUTDIR)/vimrc.o: vim.rc version.h gui_w32_rc.h
! $(WINDRES) $(WINDRES_FLAGS) $(DEFINES) \
! --input-format=rc --output-format=coff -i vim.rc -o $@
$(OUTDIR):
$(MKDIR) $(OUTDIR)
*** ../vim-7.3.485/src/version.c 2012-03-28 17:17:45.000000000 +0200
--- src/version.c 2012-03-28 17:42:25.000000000 +0200
***************
*** 716,717 ****
--- 716,719 ----
{ /* Add new patch number below this line */
+ /**/
+ 486,
/**/
--
There is a fine line between courage and foolishness.
Unfortunately, it's not a fence.
/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\ an exciting new programming language -- http://www.Zimbu.org ///
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///

572
7.3.487 Normal file
View File

@ -0,0 +1,572 @@
To: vim_dev@googlegroups.com
Subject: Patch 7.3.487
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------
Patch 7.3.487
Problem: When setting 'timeoutlen' or 'ttimeoutlen' the column for vertical
movement is reset unnecessarily.
Solution: Do not set w_set_curswant for every option. Add a test for this.
(Kana Natsuno) Add the P_CURSWANT flag for options.
Files: src/option.c, src/testdir/test84.in, src/testdir/test84.ok,
src/testdir/Make_amiga.mak, src/testdir/Make_dos.mak,
src/testdir/Make_ming.mak, src/testdir/Make_os2.mak,
src/testdir/Make_vms.mms, src/testdir/Makefile
*** ../vim-7.3.486/src/option.c 2012-03-23 16:25:13.000000000 +0100
--- src/option.c 2012-03-28 19:57:46.000000000 +0200
***************
*** 433,449 ****
#define P_RCLR 0x7000 /* clear and redraw all */
#define P_COMMA 0x8000 /* comma separated list */
! #define P_NODUP 0x10000L/* don't allow duplicate strings */
! #define P_FLAGLIST 0x20000L/* list of single-char flags */
! #define P_SECURE 0x40000L/* cannot change in modeline or secure mode */
! #define P_GETTEXT 0x80000L/* expand default value with _() */
! #define P_NOGLOB 0x100000L/* do not use local value for global vimrc */
! #define P_NFNAME 0x200000L/* only normal file name chars allowed */
! #define P_INSECURE 0x400000L/* option was set from a modeline */
! #define P_PRI_MKRC 0x800000L/* priority for :mkvimrc (setting option has
side effects) */
! #define P_NO_ML 0x1000000L/* not allowed in modeline */
#define ISK_LATIN1 (char_u *)"@,48-57,_,192-255"
--- 433,451 ----
#define P_RCLR 0x7000 /* clear and redraw all */
#define P_COMMA 0x8000 /* comma separated list */
! #define P_NODUP 0x10000L /* don't allow duplicate strings */
! #define P_FLAGLIST 0x20000L /* list of single-char flags */
! #define P_SECURE 0x40000L /* cannot change in modeline or secure mode */
! #define P_GETTEXT 0x80000L /* expand default value with _() */
! #define P_NOGLOB 0x100000L /* do not use local value for global vimrc */
! #define P_NFNAME 0x200000L /* only normal file name chars allowed */
! #define P_INSECURE 0x400000L /* option was set from a modeline */
! #define P_PRI_MKRC 0x800000L /* priority for :mkvimrc (setting option has
side effects) */
! #define P_NO_ML 0x1000000L /* not allowed in modeline */
! #define P_CURSWANT 0x2000000L /* update curswant required; not needed when
! * there is a redraw flag */
#define ISK_LATIN1 (char_u *)"@,48-57,_,192-255"
***************
*** 479,485 ****
#endif
options[] =
{
! {"aleph", "al", P_NUM|P_VI_DEF,
#ifdef FEAT_RIGHTLEFT
(char_u *)&p_aleph, PV_NONE,
#else
--- 481,487 ----
#endif
options[] =
{
! {"aleph", "al", P_NUM|P_VI_DEF|P_CURSWANT,
#ifdef FEAT_RIGHTLEFT
(char_u *)&p_aleph, PV_NONE,
#else
***************
*** 501,507 ****
{(char_u *)FALSE, (char_u *)FALSE}
#endif
SCRIPTID_INIT},
! {"arabic", "arab", P_BOOL|P_VI_DEF|P_VIM,
#ifdef FEAT_ARABIC
(char_u *)VAR_WIN, PV_ARAB,
#else
--- 503,509 ----
{(char_u *)FALSE, (char_u *)FALSE}
#endif
SCRIPTID_INIT},
! {"arabic", "arab", P_BOOL|P_VI_DEF|P_VIM|P_CURSWANT,
#ifdef FEAT_ARABIC
(char_u *)VAR_WIN, PV_ARAB,
#else
***************
*** 778,784 ****
{"columns", "co", P_NUM|P_NODEFAULT|P_NO_MKRC|P_VI_DEF|P_RCLR,
(char_u *)&Columns, PV_NONE,
{(char_u *)80L, (char_u *)0L} SCRIPTID_INIT},
! {"comments", "com", P_STRING|P_ALLOCED|P_VI_DEF|P_COMMA|P_NODUP,
#ifdef FEAT_COMMENTS
(char_u *)&p_com, PV_COM,
{(char_u *)"s1:/*,mb:*,ex:*/,://,b:#,:%,:XCOMM,n:>,fb:-",
--- 780,786 ----
{"columns", "co", P_NUM|P_NODEFAULT|P_NO_MKRC|P_VI_DEF|P_RCLR,
(char_u *)&Columns, PV_NONE,
{(char_u *)80L, (char_u *)0L} SCRIPTID_INIT},
! {"comments", "com", P_STRING|P_ALLOCED|P_VI_DEF|P_COMMA|P_NODUP|P_CURSWANT,
#ifdef FEAT_COMMENTS
(char_u *)&p_com, PV_COM,
{(char_u *)"s1:/*,mb:*,ex:*/,://,b:#,:%,:XCOMM,n:>,fb:-",
***************
*** 788,794 ****
{(char_u *)0L, (char_u *)0L}
#endif
SCRIPTID_INIT},
! {"commentstring", "cms", P_STRING|P_ALLOCED|P_VI_DEF,
#ifdef FEAT_FOLDING
(char_u *)&p_cms, PV_CMS,
{(char_u *)"/*%s*/", (char_u *)0L}
--- 790,796 ----
{(char_u *)0L, (char_u *)0L}
#endif
SCRIPTID_INIT},
! {"commentstring", "cms", P_STRING|P_ALLOCED|P_VI_DEF|P_CURSWANT,
#ifdef FEAT_FOLDING
(char_u *)&p_cms, PV_CMS,
{(char_u *)"/*%s*/", (char_u *)0L}
***************
*** 953,959 ****
{"debug", NULL, P_STRING|P_VI_DEF,
(char_u *)&p_debug, PV_NONE,
{(char_u *)"", (char_u *)0L} SCRIPTID_INIT},
! {"define", "def", P_STRING|P_ALLOCED|P_VI_DEF,
#ifdef FEAT_FIND_ID
(char_u *)&p_def, PV_DEF,
{(char_u *)"^\\s*#\\s*define", (char_u *)0L}
--- 955,961 ----
{"debug", NULL, P_STRING|P_VI_DEF,
(char_u *)&p_debug, PV_NONE,
{(char_u *)"", (char_u *)0L} SCRIPTID_INIT},
! {"define", "def", P_STRING|P_ALLOCED|P_VI_DEF|P_CURSWANT,
#ifdef FEAT_FIND_ID
(char_u *)&p_def, PV_DEF,
{(char_u *)"^\\s*#\\s*define", (char_u *)0L}
***************
*** 983,989 ****
(char_u *)NULL, PV_NONE,
#endif
{(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
! {"diffexpr", "dex", P_STRING|P_VI_DEF|P_SECURE,
#if defined(FEAT_DIFF) && defined(FEAT_EVAL)
(char_u *)&p_dex, PV_NONE,
{(char_u *)"", (char_u *)0L}
--- 985,991 ----
(char_u *)NULL, PV_NONE,
#endif
{(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
! {"diffexpr", "dex", P_STRING|P_VI_DEF|P_SECURE|P_CURSWANT,
#if defined(FEAT_DIFF) && defined(FEAT_EVAL)
(char_u *)&p_dex, PV_NONE,
{(char_u *)"", (char_u *)0L}
***************
*** 1099,1105 ****
{(char_u *)0L, (char_u *)0L}
#endif
SCRIPTID_INIT},
! {"fileformat", "ff", P_STRING|P_ALLOCED|P_VI_DEF|P_RSTAT|P_NO_MKRC,
(char_u *)&p_ff, PV_FF,
{(char_u *)DFLT_FF, (char_u *)0L} SCRIPTID_INIT},
{"fileformats", "ffs", P_STRING|P_VIM|P_COMMA|P_NODUP,
--- 1101,1107 ----
{(char_u *)0L, (char_u *)0L}
#endif
SCRIPTID_INIT},
! {"fileformat", "ff", P_STRING|P_ALLOCED|P_VI_DEF|P_RSTAT|P_NO_MKRC|P_CURSWANT,
(char_u *)&p_ff, PV_FF,
{(char_u *)DFLT_FF, (char_u *)0L} SCRIPTID_INIT},
{"fileformats", "ffs", P_STRING|P_VIM|P_COMMA|P_NODUP,
***************
*** 1159,1165 ****
{"foldlevel", "fdl", P_NUM|P_VI_DEF|P_RWIN,
(char_u *)VAR_WIN, PV_FDL,
{(char_u *)0L, (char_u *)0L} SCRIPTID_INIT},
! {"foldlevelstart","fdls", P_NUM|P_VI_DEF,
(char_u *)&p_fdls, PV_NONE,
{(char_u *)-1L, (char_u *)0L} SCRIPTID_INIT},
{"foldmarker", "fmr", P_STRING|P_ALLOCED|P_VIM|P_VI_DEF|
--- 1161,1167 ----
{"foldlevel", "fdl", P_NUM|P_VI_DEF|P_RWIN,
(char_u *)VAR_WIN, PV_FDL,
{(char_u *)0L, (char_u *)0L} SCRIPTID_INIT},
! {"foldlevelstart","fdls", P_NUM|P_VI_DEF|P_CURSWANT,
(char_u *)&p_fdls, PV_NONE,
{(char_u *)-1L, (char_u *)0L} SCRIPTID_INIT},
{"foldmarker", "fmr", P_STRING|P_ALLOCED|P_VIM|P_VI_DEF|
***************
*** 1176,1182 ****
{"foldnestmax", "fdn", P_NUM|P_VI_DEF|P_RWIN,
(char_u *)VAR_WIN, PV_FDN,
{(char_u *)20L, (char_u *)0L} SCRIPTID_INIT},
! {"foldopen", "fdo", P_STRING|P_VI_DEF|P_COMMA|P_NODUP,
(char_u *)&p_fdo, PV_NONE,
{(char_u *)"block,hor,mark,percent,quickfix,search,tag,undo",
(char_u *)0L} SCRIPTID_INIT},
--- 1178,1184 ----
{"foldnestmax", "fdn", P_NUM|P_VI_DEF|P_RWIN,
(char_u *)VAR_WIN, PV_FDN,
{(char_u *)20L, (char_u *)0L} SCRIPTID_INIT},
! {"foldopen", "fdo", P_STRING|P_VI_DEF|P_COMMA|P_NODUP|P_CURSWANT,
(char_u *)&p_fdo, PV_NONE,
{(char_u *)"block,hor,mark,percent,quickfix,search,tag,undo",
(char_u *)0L} SCRIPTID_INIT},
***************
*** 1741,1747 ****
{"matchtime", "mat", P_NUM|P_VI_DEF,
(char_u *)&p_mat, PV_NONE,
{(char_u *)5L, (char_u *)0L} SCRIPTID_INIT},
! {"maxcombine", "mco", P_NUM|P_VI_DEF,
#ifdef FEAT_MBYTE
(char_u *)&p_mco, PV_NONE,
#else
--- 1743,1749 ----
{"matchtime", "mat", P_NUM|P_VI_DEF,
(char_u *)&p_mat, PV_NONE,
{(char_u *)5L, (char_u *)0L} SCRIPTID_INIT},
! {"maxcombine", "mco", P_NUM|P_VI_DEF|P_CURSWANT,
#ifdef FEAT_MBYTE
(char_u *)&p_mco, PV_NONE,
#else
***************
*** 2710,2716 ****
{(char_u *)0L, (char_u *)0L}
#endif
SCRIPTID_INIT},
! {"virtualedit", "ve", P_STRING|P_COMMA|P_NODUP|P_VI_DEF|P_VIM,
#ifdef FEAT_VIRTUALEDIT
(char_u *)&p_ve, PV_NONE,
{(char_u *)"", (char_u *)""}
--- 2712,2718 ----
{(char_u *)0L, (char_u *)0L}
#endif
SCRIPTID_INIT},
! {"virtualedit", "ve", P_STRING|P_COMMA|P_NODUP|P_VI_DEF|P_VIM|P_CURSWANT,
#ifdef FEAT_VIRTUALEDIT
(char_u *)&p_ve, PV_NONE,
{(char_u *)"", (char_u *)""}
***************
*** 7064,7071 ****
}
#endif
! if (curwin->w_curswant != MAXCOL)
! curwin->w_set_curswant = TRUE; /* in case 'showbreak' changed */
#ifdef FEAT_GUI
/* check redraw when it's not a GUI option or the GUI is active. */
if (!redraw_gui_only || gui.in_use)
--- 7066,7075 ----
}
#endif
! if (curwin->w_curswant != MAXCOL
! && (options[opt_idx].flags & (P_CURSWANT | P_RCLR)) != 0)
! curwin->w_set_curswant = TRUE;
!
#ifdef FEAT_GUI
/* check redraw when it's not a GUI option or the GUI is active. */
if (!redraw_gui_only || gui.in_use)
***************
*** 7587,7595 ****
|| (int *)varp == &curwin->w_p_nu
|| (int *)varp == &curwin->w_p_rnu)
{
- if (curwin->w_curswant != MAXCOL)
- curwin->w_set_curswant = TRUE;
-
/* If 'number' is set, reset 'relativenumber'. */
/* If 'relativenumber' is set, reset 'number'. */
if ((int *)varp == &curwin->w_p_nu && curwin->w_p_nu)
--- 7591,7596 ----
***************
*** 7834,7841 ****
{
if (curwin->w_p_wrap)
curwin->w_leftcol = 0;
- if (curwin->w_curswant != MAXCOL)
- curwin->w_set_curswant = TRUE;
}
#ifdef FEAT_WINDOWS
--- 7835,7840 ----
***************
*** 8062,8092 ****
curbuf->b_p_imsearch = B_IMODE_USE_INSERT;
# endif
}
- if (curwin->w_curswant != MAXCOL)
- curwin->w_set_curswant = TRUE;
}
- else if ((int *)varp == &p_arshape)
- {
- if (curwin->w_curswant != MAXCOL)
- curwin->w_set_curswant = TRUE;
- }
- #endif
-
- #ifdef FEAT_LINEBREAK
- if ((int *)varp == &curwin->w_p_lbr)
- {
- if (curwin->w_curswant != MAXCOL)
- curwin->w_set_curswant = TRUE;
- }
- #endif
-
- #ifdef FEAT_RIGHTLEFT
- if ((int *)varp == &curwin->w_p_rl)
- {
- if (curwin->w_curswant != MAXCOL)
- curwin->w_set_curswant = TRUE;
- }
#endif
/*
--- 8061,8068 ----
***************
*** 8096,8102 ****
options[opt_idx].flags |= P_WAS_SET;
comp_col(); /* in case 'ruler' or 'showcmd' changed */
!
check_redraw(options[opt_idx].flags);
return NULL;
--- 8072,8080 ----
options[opt_idx].flags |= P_WAS_SET;
comp_col(); /* in case 'ruler' or 'showcmd' changed */
! if (curwin->w_curswant != MAXCOL
! && (options[opt_idx].flags & (P_CURSWANT | P_RCLR)) != 0)
! curwin->w_set_curswant = TRUE;
check_redraw(options[opt_idx].flags);
return NULL;
***************
*** 8611,8618 ****
options[opt_idx].flags |= P_WAS_SET;
comp_col(); /* in case 'columns' or 'ls' changed */
! if (curwin->w_curswant != MAXCOL)
! curwin->w_set_curswant = TRUE; /* in case 'tabstop' changed */
check_redraw(options[opt_idx].flags);
return errmsg;
--- 8589,8597 ----
options[opt_idx].flags |= P_WAS_SET;
comp_col(); /* in case 'columns' or 'ls' changed */
! if (curwin->w_curswant != MAXCOL
! && (options[opt_idx].flags & (P_CURSWANT | P_RCLR)) != 0)
! curwin->w_set_curswant = TRUE;
check_redraw(options[opt_idx].flags);
return errmsg;
*** ../vim-7.3.486/src/testdir/test84.in 2012-03-28 19:55:12.000000000 +0200
--- src/testdir/test84.in 2012-03-28 19:46:53.000000000 +0200
***************
*** 0 ****
--- 1,35 ----
+ Tests for curswant not changing when setting an option
+
+ STARTTEST
+ :so small.vim
+ :/^start target options$/+1,/^end target options$/-1 yank
+ :let target_option_names = split(@0)
+ :function TestCurswant(option_name)
+ : normal! ggf8j
+ : let curswant_before = winsaveview().curswant
+ : execute 'let' '&'.a:option_name '=' '&'.a:option_name
+ : let curswant_after = winsaveview().curswant
+ : return [a:option_name, curswant_before, curswant_after]
+ :endfunction
+ :
+ :new
+ :put =['1234567890', '12345']
+ :1 delete _
+ :let result = []
+ :for option_name in target_option_names
+ : call add(result, TestCurswant(option_name))
+ :endfor
+ :
+ :new
+ :put =map(copy(result), 'join(v:val, '' '')')
+ :1 delete _
+ :write test.out
+ :
+ :qall!
+ ENDTEST
+
+ start target options
+ tabstop
+ timeoutlen
+ ttimeoutlen
+ end target options
*** ../vim-7.3.486/src/testdir/test84.ok 2012-03-28 19:55:12.000000000 +0200
--- src/testdir/test84.ok 2012-03-28 19:48:36.000000000 +0200
***************
*** 0 ****
--- 1,3 ----
+ tabstop 7 4
+ timeoutlen 7 7
+ ttimeoutlen 7 7
*** ../vim-7.3.486/src/testdir/Make_amiga.mak 2011-10-12 19:53:31.000000000 +0200
--- src/testdir/Make_amiga.mak 2012-03-28 18:14:08.000000000 +0200
***************
*** 29,35 ****
test66.out test67.out test68.out test69.out test70.out \
test71.out test72.out test73.out test74.out test75.out \
test76.out test77.out test78.out test79.out test80.out \
! test81.out test82.out test83.out
.SUFFIXES: .in .out
--- 29,35 ----
test66.out test67.out test68.out test69.out test70.out \
test71.out test72.out test73.out test74.out test75.out \
test76.out test77.out test78.out test79.out test80.out \
! test81.out test82.out test83.out test84.out
.SUFFIXES: .in .out
***************
*** 132,134 ****
--- 132,135 ----
test81.out: test81.in
test82.out: test82.in
test83.out: test83.in
+ test84.out: test84.in
*** ../vim-7.3.486/src/testdir/Make_dos.mak 2011-10-12 19:53:31.000000000 +0200
--- src/testdir/Make_dos.mak 2012-03-28 18:14:41.000000000 +0200
***************
*** 29,35 ****
test42.out test52.out test65.out test66.out test67.out \
test68.out test69.out test71.out test72.out test73.out \
test74.out test75.out test76.out test77.out test78.out \
! test79.out test80.out test81.out test82.out test83.out
SCRIPTS32 = test50.out test70.out
--- 29,36 ----
test42.out test52.out test65.out test66.out test67.out \
test68.out test69.out test71.out test72.out test73.out \
test74.out test75.out test76.out test77.out test78.out \
! test79.out test80.out test81.out test82.out test83.out \
! test84.out
SCRIPTS32 = test50.out test70.out
*** ../vim-7.3.486/src/testdir/Make_ming.mak 2011-10-12 19:53:31.000000000 +0200
--- src/testdir/Make_ming.mak 2012-03-28 18:14:46.000000000 +0200
***************
*** 49,55 ****
test42.out test52.out test65.out test66.out test67.out \
test68.out test69.out test71.out test72.out test73.out \
test74.out test75.out test76.out test77.out test78.out \
! test79.out test80.out test81.out test82.out test83.out
SCRIPTS32 = test50.out test70.out
--- 49,56 ----
test42.out test52.out test65.out test66.out test67.out \
test68.out test69.out test71.out test72.out test73.out \
test74.out test75.out test76.out test77.out test78.out \
! test79.out test80.out test81.out test82.out test83.out \
! test84.out
SCRIPTS32 = test50.out test70.out
*** ../vim-7.3.486/src/testdir/Make_os2.mak 2011-10-12 19:53:31.000000000 +0200
--- src/testdir/Make_os2.mak 2012-03-28 18:15:00.000000000 +0200
***************
*** 29,35 ****
test66.out test67.out test68.out test69.out test70.out \
test71.out test72.out test73.out test74.out test75.out \
test76.out test77.out test78.out test79.out test80.out \
! test81.out test82.out test83.out
.SUFFIXES: .in .out
--- 29,35 ----
test66.out test67.out test68.out test69.out test70.out \
test71.out test72.out test73.out test74.out test75.out \
test76.out test77.out test78.out test79.out test80.out \
! test81.out test82.out test83.out test84.out
.SUFFIXES: .in .out
*** ../vim-7.3.486/src/testdir/Make_vms.mms 2011-10-12 19:53:31.000000000 +0200
--- src/testdir/Make_vms.mms 2012-03-28 18:15:15.000000000 +0200
***************
*** 4,10 ****
# Authors: Zoltan Arpadffy, <arpadffy@polarhome.com>
# Sandor Kopanyi, <sandor.kopanyi@mailbox.hu>
#
! # Last change: 2011 Jul 15
#
# This has been tested on VMS 6.2 to 8.3 on DEC Alpha, VAX and IA64.
# Edit the lines in the Configuration section below to select.
--- 4,10 ----
# Authors: Zoltan Arpadffy, <arpadffy@polarhome.com>
# Sandor Kopanyi, <sandor.kopanyi@mailbox.hu>
#
! # Last change: 2012 Mar 28
#
# This has been tested on VMS 6.2 to 8.3 on DEC Alpha, VAX and IA64.
# Edit the lines in the Configuration section below to select.
***************
*** 76,82 ****
test66.out test67.out test68.out test69.out \
test71.out test72.out test74.out test75.out test76.out \
test77.out test78.out test79.out test80.out test81.out \
! test82.out test83.out
# Known problems:
# Test 30: a problem around mac format - unknown reason
--- 76,82 ----
test66.out test67.out test68.out test69.out \
test71.out test72.out test74.out test75.out test76.out \
test77.out test78.out test79.out test80.out test81.out \
! test82.out test83.out test84.out
# Known problems:
# Test 30: a problem around mac format - unknown reason
*** ../vim-7.3.486/src/testdir/Makefile 2011-10-12 19:53:31.000000000 +0200
--- src/testdir/Makefile 2012-03-28 18:15:29.000000000 +0200
***************
*** 26,32 ****
test64.out test65.out test66.out test67.out test68.out \
test69.out test70.out test71.out test72.out test73.out \
test74.out test75.out test76.out test77.out test78.out \
! test79.out test80.out test81.out test82.out test83.out
SCRIPTS_GUI = test16.out
--- 26,33 ----
test64.out test65.out test66.out test67.out test68.out \
test69.out test70.out test71.out test72.out test73.out \
test74.out test75.out test76.out test77.out test78.out \
! test79.out test80.out test81.out test82.out test83.out \
! test84.out
SCRIPTS_GUI = test16.out
*** ../vim-7.3.486/src/version.c 2012-03-28 17:43:06.000000000 +0200
--- src/version.c 2012-03-28 19:49:41.000000000 +0200
***************
*** 716,717 ****
--- 716,719 ----
{ /* Add new patch number below this line */
+ /**/
+ 487,
/**/
--
"Time flies like an arrow". So I put an arrow on my desk, now
awaiting one of these time flies showing up.
/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\ an exciting new programming language -- http://www.Zimbu.org ///
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///

52
7.3.488 Normal file
View File

@ -0,0 +1,52 @@
To: vim_dev@googlegroups.com
Subject: Patch 7.3.488
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------
Patch 7.3.488
Problem: ":help!" in a help file does not work as document.
Solution: When in a help file don't give an error message. (thinca)
Files: src/ex_cmds.c
*** ../vim-7.3.487/src/ex_cmds.c 2012-03-16 14:32:10.000000000 +0100
--- src/ex_cmds.c 2012-04-01 14:25:35.000000000 +0200
***************
*** 5546,5552 ****
}
arg = eap->arg;
! if (eap->forceit && *arg == NUL)
{
EMSG(_("E478: Don't panic!"));
return;
--- 5546,5552 ----
}
arg = eap->arg;
! if (eap->forceit && *arg == NUL && !curbuf->b_help)
{
EMSG(_("E478: Don't panic!"));
return;
*** ../vim-7.3.487/src/version.c 2012-03-28 19:58:34.000000000 +0200
--- src/version.c 2012-04-05 16:04:13.000000000 +0200
***************
*** 716,717 ****
--- 716,719 ----
{ /* Add new patch number below this line */
+ /**/
+ 488,
/**/
--
I'd like to meet the man who invented sex and see what he's working on now.
/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\ an exciting new programming language -- http://www.Zimbu.org ///
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///

89
7.3.489 Normal file
View File

@ -0,0 +1,89 @@
To: vim_dev@googlegroups.com
Subject: Patch 7.3.489
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------
Patch 7.3.489
Problem: CTRL-] in Insert mode does not expand abbreviation when used in a
mapping. (Yichao Zhou)
Solution: Special case using CTRL-]. (Christian Brabandt)
Files: src/getchar.c, src/edit.c
*** ../vim-7.3.488/src/getchar.c 2012-02-05 22:05:44.000000000 +0100
--- src/getchar.c 2012-04-05 15:54:00.000000000 +0200
***************
*** 4352,4359 ****
if (typebuf.tb_no_abbr_cnt) /* abbrev. are not recursive */
return FALSE;
! if ((KeyNoremap & (RM_NONE|RM_SCRIPT)) != 0)
! /* no remapping implies no abbreviation */
return FALSE;
/*
--- 4352,4360 ----
if (typebuf.tb_no_abbr_cnt) /* abbrev. are not recursive */
return FALSE;
!
! /* no remapping implies no abbreviation, except for CTRL-] */
! if ((KeyNoremap & (RM_NONE|RM_SCRIPT)) != 0 && c != Ctrl_RSB)
return FALSE;
/*
*** ../vim-7.3.488/src/edit.c 2012-02-29 18:22:03.000000000 +0100
--- src/edit.c 2012-04-05 15:57:46.000000000 +0200
***************
*** 1455,1467 ****
Insstart_blank_vcol = get_nolist_virtcol();
}
! if (vim_iswordc(c) || !echeck_abbr(
#ifdef FEAT_MBYTE
/* Add ABBR_OFF for characters above 0x100, this is
* what check_abbr() expects. */
(has_mbyte && c >= 0x100) ? (c + ABBR_OFF) :
#endif
! c))
{
insert_special(c, FALSE, FALSE);
#ifdef FEAT_RIGHTLEFT
--- 1455,1470 ----
Insstart_blank_vcol = get_nolist_virtcol();
}
! /* Insert a normal character and check for abbreviations on a
! * special character. Let CTRL-] expand abbreviations without
! * inserting it. */
! if (vim_iswordc(c) || (!echeck_abbr(
#ifdef FEAT_MBYTE
/* Add ABBR_OFF for characters above 0x100, this is
* what check_abbr() expects. */
(has_mbyte && c >= 0x100) ? (c + ABBR_OFF) :
#endif
! c) && c != Ctrl_RSB))
{
insert_special(c, FALSE, FALSE);
#ifdef FEAT_RIGHTLEFT
*** ../vim-7.3.488/src/version.c 2012-04-05 16:04:58.000000000 +0200
--- src/version.c 2012-04-05 16:06:12.000000000 +0200
***************
*** 716,717 ****
--- 716,719 ----
{ /* Add new patch number below this line */
+ /**/
+ 489,
/**/
--
Just think of all the things we haven't thought of yet.
/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\ an exciting new programming language -- http://www.Zimbu.org ///
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///

2517
7.3.490 Normal file
View File

File diff suppressed because it is too large Load Diff

235
7.3.491 Normal file
View File

@ -0,0 +1,235 @@
To: vim_dev@googlegroups.com
Subject: Patch 7.3.491
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------
Patch 7.3.491
Problem: No tests for Lua.
Solution: Add some simple tests for Lua. (Luis Carvalho)
Files: src/testdir/test1.in, src/testdir/test85.in, src/testdir/test85.ok
src/testdir/Make_amiga.mak, src/testdir/Make_dos.mak,
src/testdir/Make_ming.mak, src/testdir/Make_os2.mak,
src/testdir/Make_vms.mms, src/testdir/Makefile
*** ../vim-7.3.490/src/testdir/test1.in 2010-08-15 21:57:29.000000000 +0200
--- src/testdir/test1.in 2012-04-05 16:37:37.000000000 +0200
***************
*** 15,20 ****
--- 15,21 ----
be set like small.vim above. mbyte.vim is sourced by tests that require the
+multi_byte feature.
Similar logic is applied to the +mzscheme feature, using mzscheme.vim.
+ Similar logic is applied to the +lua feature, using lua.vim.
STARTTEST
:" Write a single line to test.out to check if testing works at all.
***************
*** 28,37 ****
--- 29,45 ----
qa!
:w! mbyte.vim
:w! mzscheme.vim
+ :w! lua.vim
+ :"
:" If +multi_byte feature supported, make mbyte.vim empty.
:if has("multi_byte") | sp another | w! mbyte.vim | q | endif
+ :"
:" If +mzscheme feature supported, make mzscheme.vim empty.
:if has("mzscheme") | sp another | w! mzscheme.vim | q | endif
+ :"
+ :" If +lua feature supported, make lua.vim empty.
+ :if has("lua") | sp another | w! lua.vim | q | endif
+ :"
:" If +eval feature supported quit here, leaving tiny.vim and small.vim empty.
:" Otherwise write small.vim to skip the test.
:if 1 | q! | endif
*** ../vim-7.3.490/src/testdir/test85.in 2012-04-05 16:56:12.000000000 +0200
--- src/testdir/test85.in 2012-04-05 16:44:00.000000000 +0200
***************
*** 0 ****
--- 1,42 ----
+ Test for Lua interface and luaeval() function
+
+ STARTTEST
+ :so small.vim
+ :so lua.vim
+ :set nocompatible viminfo+=nviminfo
+ :lua l = vim.list():add"item0":add"dictionary with list OK":add"item2"
+ :lua h = vim.dict(); h.list = l
+ :call garbagecollect()
+ /^1
+ :" change buffer contents
+ :lua curbuf = vim.buffer()
+ :lua curline = vim.eval"line('.')"
+ :lua curbuf[curline] = "1 changed line 1"
+ :" scalar test
+ :let tmp_string = luaeval('"string"')
+ :let tmp_1000 = luaeval('1000')
+ :if printf("%s%.0f", tmp_string, tmp_1000) == "string1000"
+ :let scalar_res = "OK"
+ :else
+ :let scalar_res = "FAILED"
+ :endif
+ :call append(search("^1"), "scalar test " . scalar_res)
+ :" dictionary containing a list
+ :let tmp = luaeval("h").list[1]
+ :/^2/put =tmp
+ :" circular list (at the same time test lists containing lists)
+ :lua l[2] = l
+ :let l2 = luaeval("h").list
+ :if l2[2] == l2
+ :let res = "OK"
+ :else
+ :let res = "FAILED"
+ :endif
+ :call setline(search("^3"), "circular test " . res)
+ :?^1?,$w! test.out
+ :qa!
+ ENDTEST
+
+ 1 line 1
+ 2 line 2
+ 3 line 3
*** ../vim-7.3.490/src/testdir/test85.ok 2012-04-05 16:56:12.000000000 +0200
--- src/testdir/test85.ok 2012-04-05 16:18:56.000000000 +0200
***************
*** 0 ****
--- 1,5 ----
+ 1 changed line 1
+ scalar test OK
+ 2 line 2
+ dictionary with list OK
+ circular test OK
*** ../vim-7.3.490/src/testdir/Make_amiga.mak 2012-03-28 19:58:34.000000000 +0200
--- src/testdir/Make_amiga.mak 2012-04-05 16:21:55.000000000 +0200
***************
*** 13,18 ****
--- 13,19 ----
# test25 uses symbolic link
# test27 can't edit file with "*"
# test52 only for Win32
+ # test85 no Lua interface
SCRIPTS = test1.out test3.out test4.out test5.out test6.out \
test7.out test8.out test9.out \
*** ../vim-7.3.490/src/testdir/Make_dos.mak 2012-03-28 19:58:34.000000000 +0200
--- src/testdir/Make_dos.mak 2012-04-05 16:22:16.000000000 +0200
***************
*** 30,36 ****
test68.out test69.out test71.out test72.out test73.out \
test74.out test75.out test76.out test77.out test78.out \
test79.out test80.out test81.out test82.out test83.out \
! test84.out
SCRIPTS32 = test50.out test70.out
--- 30,36 ----
test68.out test69.out test71.out test72.out test73.out \
test74.out test75.out test76.out test77.out test78.out \
test79.out test80.out test81.out test82.out test83.out \
! test84.out test85.out
SCRIPTS32 = test50.out test70.out
*** ../vim-7.3.490/src/testdir/Make_ming.mak 2012-03-28 19:58:34.000000000 +0200
--- src/testdir/Make_ming.mak 2012-04-05 16:22:25.000000000 +0200
***************
*** 50,56 ****
test68.out test69.out test71.out test72.out test73.out \
test74.out test75.out test76.out test77.out test78.out \
test79.out test80.out test81.out test82.out test83.out \
! test84.out
SCRIPTS32 = test50.out test70.out
--- 50,56 ----
test68.out test69.out test71.out test72.out test73.out \
test74.out test75.out test76.out test77.out test78.out \
test79.out test80.out test81.out test82.out test83.out \
! test84.out test85.out
SCRIPTS32 = test50.out test70.out
*** ../vim-7.3.490/src/testdir/Make_os2.mak 2012-03-28 19:58:34.000000000 +0200
--- src/testdir/Make_os2.mak 2012-04-05 16:22:38.000000000 +0200
***************
*** 13,18 ****
--- 13,19 ----
# test25 uses symbolic link
# test27 can't edit file with "*" in file name
# test52 only for Win32
+ # test85 no Lua interface
SCRIPTS = test1.out test3.out test4.out test5.out test6.out \
test7.out test8.out test9.out \
*** ../vim-7.3.490/src/testdir/Make_vms.mms 2012-03-28 19:58:34.000000000 +0200
--- src/testdir/Make_vms.mms 2012-04-05 16:23:08.000000000 +0200
***************
*** 4,10 ****
# Authors: Zoltan Arpadffy, <arpadffy@polarhome.com>
# Sandor Kopanyi, <sandor.kopanyi@mailbox.hu>
#
! # Last change: 2012 Mar 28
#
# This has been tested on VMS 6.2 to 8.3 on DEC Alpha, VAX and IA64.
# Edit the lines in the Configuration section below to select.
--- 4,10 ----
# Authors: Zoltan Arpadffy, <arpadffy@polarhome.com>
# Sandor Kopanyi, <sandor.kopanyi@mailbox.hu>
#
! # Last change: 2012 Apr 05
#
# This has been tested on VMS 6.2 to 8.3 on DEC Alpha, VAX and IA64.
# Edit the lines in the Configuration section below to select.
***************
*** 89,94 ****
--- 89,95 ----
# with too many dots).
#
# Test 72: unknown reason
+ # Test 85: no Lua interface
.IFDEF WANT_GUI
SCRIPT_GUI = test16.out
*** ../vim-7.3.490/src/testdir/Makefile 2012-03-28 19:58:34.000000000 +0200
--- src/testdir/Makefile 2012-04-05 16:21:13.000000000 +0200
***************
*** 27,33 ****
test69.out test70.out test71.out test72.out test73.out \
test74.out test75.out test76.out test77.out test78.out \
test79.out test80.out test81.out test82.out test83.out \
! test84.out
SCRIPTS_GUI = test16.out
--- 27,33 ----
test69.out test70.out test71.out test72.out test73.out \
test74.out test75.out test76.out test77.out test78.out \
test79.out test80.out test81.out test82.out test83.out \
! test84.out test85.out
SCRIPTS_GUI = test16.out
*** ../vim-7.3.490/src/version.c 2012-04-05 16:53:56.000000000 +0200
--- src/version.c 2012-04-05 16:55:27.000000000 +0200
***************
*** 716,717 ****
--- 716,719 ----
{ /* Add new patch number below this line */
+ /**/
+ 491,
/**/
--
You had connectors? Eeee, when I were a lad we 'ad to carry the
bits between the computer and the terminal with a spoon...
/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\ an exciting new programming language -- http://www.Zimbu.org ///
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///

718
7.3.492 Normal file
View File

@ -0,0 +1,718 @@
To: vim_dev@googlegroups.com
Subject: Patch 7.3.492
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------
Patch 7.3.492
Problem: Can't indent conditions separately from function arguments.
Solution: Add the 'k' flag in 'cino. (Lech Lorens)
Files: runtime/doc/indent.txt, src/misc1.c, src/testdir/test3.in,
src/testdir/test3.ok
*** ../vim-7.3.491/runtime/doc/indent.txt 2011-06-26 03:16:58.000000000 +0200
--- runtime/doc/indent.txt 2012-04-05 17:12:14.000000000 +0200
***************
*** 459,464 ****
--- 460,481 ----
a_short_line(argument, a_short_line(argument,
argument); argument);
<
+ *cino-k*
+ kN When in unclosed parentheses which follow "if", "for" or
+ "while" and N is non-zero, overrides the behaviour defined by
+ "(N": causes the indent to be N characters relative to the outer
+ context (i.e. the line where "if", "for" or "while" is). Has
+ no effect on deeper levels of nesting. Affects flags like "wN"
+ only for the "if", "for" and "while" conditions. If 0, defaults
+ to behaviour defined by the "(N" flag. (default: 0).
+
+ cino=(0 cino=(0,ks >
+ if (condition1 if (condition1
+ && condition2) && condition2)
+ action(); action();
+ function(argument1 function(argument1
+ && argument2); && argument2);
+ <
*cino-m*
mN When N is non-zero, line up a line starting with a closing
parentheses with the first character of the line with the
***************
*** 527,540 ****
*cino-#*
#N When N is non-zero recognize shell/Perl comments, starting with
! '#'. Default N is zero: don't recognizes '#' comments. Note
that lines starting with # will still be seen as preprocessor
lines.
The defaults, spelled out in full, are:
cinoptions=>s,e0,n0,f0,{0,}0,^0,L-1,:s,=s,l0,b0,gs,hs,N0,ps,ts,is,+s,
! c3,C0,/0,(2s,us,U0,w0,W0,m0,j0,J0,)20,*70,#0
Vim puts a line in column 1 if:
- It starts with '#' (preprocessor directives), if 'cinkeys' contains '#'.
--- 546,559 ----
*cino-#*
#N When N is non-zero recognize shell/Perl comments, starting with
! '#'. Default N is zero: don't recognize '#' comments. Note
that lines starting with # will still be seen as preprocessor
lines.
The defaults, spelled out in full, are:
cinoptions=>s,e0,n0,f0,{0,}0,^0,L-1,:s,=s,l0,b0,gs,hs,N0,ps,ts,is,+s,
! c3,C0,/0,(2s,us,U0,w0,W0,k0,m0,j0,J0,)20,*70,#0
Vim puts a line in column 1 if:
- It starts with '#' (preprocessor directives), if 'cinkeys' contains '#'.
*** ../vim-7.3.491/src/misc1.c 2012-02-29 13:49:03.000000000 +0100
--- src/misc1.c 2012-04-05 17:12:14.000000000 +0200
***************
*** 5771,5776 ****
--- 5771,5822 ----
}
/*
+ * Check whether in "p" there is an "if", "for" or "while" before offset.
+ * Return 0 if there is none.
+ * Otherwise return !0 and update "*poffset" to point to the place where the
+ * string was found.
+ */
+ static int
+ cin_is_if_for_while_before_offset(line, offset, poffset)
+ char_u *line;
+ size_t offset;
+ int *poffset;
+ {
+
+ if (offset-- < 2)
+ return 0;
+ while (offset > 2 && vim_iswhite(line[offset]))
+ --offset;
+
+ offset -= 1;
+ if (!STRNCMP(line + offset, "if", 2))
+ goto probablyFound;
+
+ if (offset >= 1)
+ {
+ offset -= 1;
+ if (!STRNCMP(line + offset, "for", 3))
+ goto probablyFound;
+
+ if (offset >= 2)
+ {
+ offset -= 2;
+ if (!STRNCMP(line + offset, "while", 5))
+ goto probablyFound;
+ }
+ }
+
+ return 0;
+ probablyFound:
+ if (!offset || !vim_isIDc(line[offset - 1]))
+ {
+ *poffset = offset;
+ return 1;
+ }
+ return 0;
+ }
+
+ /*
* Return TRUE if we are at the end of a do-while.
* do
* nothing;
***************
*** 6124,6130 ****
/*
* Find the matching '(', failing if it is in a comment.
! * Return NULL of no match found.
*/
static pos_T *
find_match_paren(ind_maxparen, ind_maxcomment) /* XXX */
--- 6170,6176 ----
/*
* Find the matching '(', failing if it is in a comment.
! * Return NULL if no match found.
*/
static pos_T *
find_match_paren(ind_maxparen, ind_maxcomment) /* XXX */
***************
*** 6393,6398 ****
--- 6439,6450 ----
*/
int ind_cpp_namespace = 0;
+ /*
+ * handle continuation lines containing conditions of if(), for() and
+ * while()
+ */
+ int ind_if_for_while = 0;
+
pos_T cur_curpos;
int amount;
int scope_amount;
***************
*** 6437,6442 ****
--- 6489,6495 ----
int cont_amount = 0; /* amount for continuation line */
int original_line_islabel;
int added_to_amount = 0;
+ int is_if_for_while = 0;
for (options = curbuf->b_p_cino; *options; )
{
***************
*** 6509,6514 ****
--- 6562,6568 ----
case 'l': ind_keep_case_label = n; break;
case '#': ind_hash_comment = n; break;
case 'N': ind_cpp_namespace = n; break;
+ case 'k': ind_if_for_while = n; break;
}
if (*options == ',')
++options;
***************
*** 6812,6817 ****
--- 6866,6900 ----
if (amount == -1)
{
int ignore_paren_col = 0;
+ int is_if_for_while = 0;
+
+ if (ind_if_for_while)
+ {
+ /* Look for the outermost opening parenthesis on this line
+ * and check whether it belongs to an "if", "for" or "while". */
+
+ pos_T cursor_save = curwin->w_cursor;
+ pos_T outermost;
+ char_u *line;
+ int look_col;
+
+ trypos = &our_paren_pos;
+ do {
+ outermost = *trypos;
+ curwin->w_cursor.lnum = outermost.lnum;
+ curwin->w_cursor.col = outermost.col;
+
+ trypos = find_match_paren(ind_maxparen, ind_maxcomment);
+ } while (trypos && trypos->lnum == outermost.lnum);
+
+ curwin->w_cursor = cursor_save;
+
+ line = ml_get(outermost.lnum);
+
+ is_if_for_while =
+ cin_is_if_for_while_before_offset(line, outermost.col,
+ &outermost.col);
+ }
amount = skip_label(our_paren_pos.lnum, &look, ind_maxcomment);
look = skipwhite(look);
***************
*** 6836,6842 ****
curwin->w_cursor.lnum = save_lnum;
look = ml_get(our_paren_pos.lnum) + look_col;
}
! if (theline[0] == ')' || ind_unclosed == 0
|| (!ind_unclosed_noignore && *look == '('
&& ignore_paren_col == 0))
{
--- 6919,6925 ----
curwin->w_cursor.lnum = save_lnum;
look = ml_get(our_paren_pos.lnum) + look_col;
}
! if (theline[0] == ')' || (ind_unclosed == 0 && is_if_for_while == 0)
|| (!ind_unclosed_noignore && *look == '('
&& ignore_paren_col == 0))
{
***************
*** 6907,6913 ****
{
/* Line up with the start of the matching paren line. */
}
! else if (ind_unclosed == 0 || (!ind_unclosed_noignore
&& *look == '(' && ignore_paren_col == 0))
{
if (cur_amount != MAXCOL)
--- 6990,6997 ----
{
/* Line up with the start of the matching paren line. */
}
! else if ((ind_unclosed == 0 && is_if_for_while == 0)
! || (!ind_unclosed_noignore
&& *look == '(' && ignore_paren_col == 0))
{
if (cur_amount != MAXCOL)
***************
*** 6943,6949 ****
if (find_match_paren(ind_maxparen, ind_maxcomment) != NULL)
amount += ind_unclosed2;
else
! amount += ind_unclosed;
}
/*
* For a line starting with ')' use the minimum of the two
--- 7027,7038 ----
if (find_match_paren(ind_maxparen, ind_maxcomment) != NULL)
amount += ind_unclosed2;
else
! {
! if (is_if_for_while)
! amount += ind_if_for_while;
! else
! amount += ind_unclosed;
! }
}
/*
* For a line starting with ')' use the minimum of the two
*** ../vim-7.3.491/src/testdir/test3.in 2011-12-14 20:21:29.000000000 +0100
--- src/testdir/test3.in 2012-04-05 17:12:14.000000000 +0200
***************
*** 1574,1579 ****
--- 1574,1793 ----
}
STARTTEST
+ :set cino=k2s,(0
+ 2kdd3j=][
+ ENDTEST
+
+ void func(void)
+ {
+ if (condition1
+ && condition2)
+ action();
+ function(argument1
+ && argument2);
+
+ if (c1 && (c2 ||
+ c3))
+ foo;
+ if (c1 &&
+ (c2 || c3))
+ {
+ }
+
+ if ( c1
+ && ( c2
+ || c3))
+ foo;
+ func( c1
+ && ( c2
+ || c3))
+ foo;
+ }
+
+ STARTTEST
+ :set cino=k2s,(s
+ 2kdd3j=][
+ ENDTEST
+
+ void func(void)
+ {
+ if (condition1
+ && condition2)
+ action();
+ function(argument1
+ && argument2);
+
+ if (c1 && (c2 ||
+ c3))
+ foo;
+ if (c1 &&
+ (c2 || c3))
+ {
+ }
+
+ if ( c1
+ && ( c2
+ || c3))
+ foo;
+ func( c1
+ && ( c2
+ || c3))
+ foo;
+ }
+
+ STARTTEST
+ :set cino=k2s,(s,U1
+ 2kdd3j=][
+ ENDTEST
+
+ void func(void)
+ {
+ if (condition1
+ && condition2)
+ action();
+ function(argument1
+ && argument2);
+
+ if (c1 && (c2 ||
+ c3))
+ foo;
+ if (c1 &&
+ (c2 || c3))
+ {
+ }
+ if (c123456789
+ && (c22345
+ || c3))
+ printf("foo\n");
+
+ c = c1 &&
+ (
+ c2 ||
+ c3
+ ) && c4;
+ }
+
+ STARTTEST
+ :set cino=k2s,(0,W4
+ 2kdd3j=][
+ ENDTEST
+
+ void func(void)
+ {
+ if (condition1
+ && condition2)
+ action();
+ function(argument1
+ && argument2);
+
+ if (c1 && (c2 ||
+ c3))
+ foo;
+ if (c1 &&
+ (c2 || c3))
+ {
+ }
+ if (c123456789
+ && (c22345
+ || c3))
+ printf("foo\n");
+
+ if ( c1
+ && ( c2
+ || c3))
+ foo;
+
+ a_long_line(
+ argument,
+ argument);
+ a_short_line(argument,
+ argument);
+ }
+
+ STARTTEST
+ :set cino=k2s,u2
+ 2kdd3j=][
+ ENDTEST
+
+ void func(void)
+ {
+ if (condition1
+ && condition2)
+ action();
+ function(argument1
+ && argument2);
+
+ if (c1 && (c2 ||
+ c3))
+ foo;
+ if (c1 &&
+ (c2 || c3))
+ {
+ }
+ if (c123456789
+ && (c22345
+ || c3))
+ printf("foo\n");
+ }
+
+ STARTTEST
+ :set cino=k2s,(0,w1
+ 2kdd3j=][
+ ENDTEST
+
+ void func(void)
+ {
+ if (condition1
+ && condition2)
+ action();
+ function(argument1
+ && argument2);
+
+ if (c1 && (c2 ||
+ c3))
+ foo;
+ if (c1 &&
+ (c2 || c3))
+ {
+ }
+ if (c123456789
+ && (c22345
+ || c3))
+ printf("foo\n");
+
+ if ( c1
+ && ( c2
+ || c3))
+ foo;
+ func( c1
+ && ( c2
+ || c3))
+ foo;
+ }
+
+ STARTTEST
+ :set cino=k2,(s
+ 2kdd3j=][
+ ENDTEST
+
+ void func(void)
+ {
+ if (condition1
+ && condition2)
+ action();
+ function(argument1
+ && argument2);
+
+ if (c1 && (c2 ||
+ c3))
+ foo;
+ if (c1 &&
+ (c2 || c3))
+ {
+ }
+ }
+
+ STARTTEST
:set cino=N-s
/^NAMESPACESTART
=/^NAMESPACEEND
*** ../vim-7.3.491/src/testdir/test3.ok 2011-12-14 20:21:29.000000000 +0100
--- src/testdir/test3.ok 2012-04-05 17:12:14.000000000 +0200
***************
*** 1411,1416 ****
--- 1411,1602 ----
}
+ void func(void)
+ {
+ if (condition1
+ && condition2)
+ action();
+ function(argument1
+ && argument2);
+
+ if (c1 && (c2 ||
+ c3))
+ foo;
+ if (c1 &&
+ (c2 || c3))
+ {
+ }
+
+ if ( c1
+ && ( c2
+ || c3))
+ foo;
+ func( c1
+ && ( c2
+ || c3))
+ foo;
+ }
+
+
+ void func(void)
+ {
+ if (condition1
+ && condition2)
+ action();
+ function(argument1
+ && argument2);
+
+ if (c1 && (c2 ||
+ c3))
+ foo;
+ if (c1 &&
+ (c2 || c3))
+ {
+ }
+
+ if ( c1
+ && ( c2
+ || c3))
+ foo;
+ func( c1
+ && ( c2
+ || c3))
+ foo;
+ }
+
+
+ void func(void)
+ {
+ if (condition1
+ && condition2)
+ action();
+ function(argument1
+ && argument2);
+
+ if (c1 && (c2 ||
+ c3))
+ foo;
+ if (c1 &&
+ (c2 || c3))
+ {
+ }
+ if (c123456789
+ && (c22345
+ || c3))
+ printf("foo\n");
+
+ c = c1 &&
+ (
+ c2 ||
+ c3
+ ) && c4;
+ }
+
+
+ void func(void)
+ {
+ if (condition1
+ && condition2)
+ action();
+ function(argument1
+ && argument2);
+
+ if (c1 && (c2 ||
+ c3))
+ foo;
+ if (c1 &&
+ (c2 || c3))
+ {
+ }
+ if (c123456789
+ && (c22345
+ || c3))
+ printf("foo\n");
+
+ if ( c1
+ && ( c2
+ || c3))
+ foo;
+
+ a_long_line(
+ argument,
+ argument);
+ a_short_line(argument,
+ argument);
+ }
+
+
+ void func(void)
+ {
+ if (condition1
+ && condition2)
+ action();
+ function(argument1
+ && argument2);
+
+ if (c1 && (c2 ||
+ c3))
+ foo;
+ if (c1 &&
+ (c2 || c3))
+ {
+ }
+ if (c123456789
+ && (c22345
+ || c3))
+ printf("foo\n");
+ }
+
+
+ void func(void)
+ {
+ if (condition1
+ && condition2)
+ action();
+ function(argument1
+ && argument2);
+
+ if (c1 && (c2 ||
+ c3))
+ foo;
+ if (c1 &&
+ (c2 || c3))
+ {
+ }
+ if (c123456789
+ && (c22345
+ || c3))
+ printf("foo\n");
+
+ if ( c1
+ && ( c2
+ || c3))
+ foo;
+ func( c1
+ && ( c2
+ || c3))
+ foo;
+ }
+
+
+ void func(void)
+ {
+ if (condition1
+ && condition2)
+ action();
+ function(argument1
+ && argument2);
+
+ if (c1 && (c2 ||
+ c3))
+ foo;
+ if (c1 &&
+ (c2 || c3))
+ {
+ }
+ }
+
+
NAMESPACESTART
/* valid namespaces with normal indent */
namespace
*** ../vim-7.3.491/src/version.c 2012-04-05 16:56:38.000000000 +0200
--- src/version.c 2012-04-05 17:14:18.000000000 +0200
***************
*** 716,717 ****
--- 716,719 ----
{ /* Add new patch number below this line */
+ /**/
+ 492,
/**/
--
You were lucky to have a LAKE! There were a hundred and sixty of
us living in a small shoebox in the middle of the road.
/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\ an exciting new programming language -- http://www.Zimbu.org ///
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///

54
7.3.493 Normal file
View File

@ -0,0 +1,54 @@
To: vim_dev@googlegroups.com
Subject: Patch 7.3.493
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------
Patch 7.3.493 (after 7.3.492)
Problem: Two unused variables.
Solution: Remove them. (Hong Xu)
Files: src/misc1.c
*** ../vim-7.3.492/src/misc1.c 2012-04-05 17:17:38.000000000 +0200
--- src/misc1.c 2012-04-06 13:49:39.000000000 +0200
***************
*** 6489,6495 ****
int cont_amount = 0; /* amount for continuation line */
int original_line_islabel;
int added_to_amount = 0;
- int is_if_for_while = 0;
for (options = curbuf->b_p_cino; *options; )
{
--- 6489,6494 ----
***************
*** 6876,6882 ****
pos_T cursor_save = curwin->w_cursor;
pos_T outermost;
char_u *line;
- int look_col;
trypos = &our_paren_pos;
do {
--- 6875,6880 ----
*** ../vim-7.3.492/src/version.c 2012-04-05 17:17:38.000000000 +0200
--- src/version.c 2012-04-06 13:50:21.000000000 +0200
***************
*** 716,717 ****
--- 716,719 ----
{ /* Add new patch number below this line */
+ /**/
+ 493,
/**/
--
Not too long ago, compress was something you did to garbage...
/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\ an exciting new programming language -- http://www.Zimbu.org ///
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///

186
7.3.494 Normal file
View File

@ -0,0 +1,186 @@
To: vim_dev@googlegroups.com
Subject: Patch 7.3.494
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------
Patch 7.3.494 (after 7.3.491)
Problem: Can't compile with Lua 9.1 or dynamic Lua.
Solution: Fix dll_ methods. Fix luado(). (Muraoka Taro, Luis Carvalho)
Files: src/if_lua.c
*** ../vim-7.3.493/src/if_lua.c 2012-04-05 16:53:56.000000000 +0200
--- src/if_lua.c 2012-04-06 14:24:06.000000000 +0200
***************
*** 95,100 ****
--- 95,101 ----
#define luaL_loadbufferx dll_luaL_loadbufferx
#define luaL_argerror dll_luaL_argerror
#endif
+ #define luaL_checkany dll_luaL_checkany
#define luaL_checklstring dll_luaL_checklstring
#define luaL_checkinteger dll_luaL_checkinteger
#define luaL_optinteger dll_luaL_optinteger
***************
*** 117,124 ****
#define lua_pcallk dll_lua_pcallk
#define lua_getglobal dll_lua_getglobal
#define lua_setglobal dll_lua_setglobal
- #define lua_typename dll_lua_typename
#endif
#define lua_close dll_lua_close
#define lua_gettop dll_lua_gettop
#define lua_settop dll_lua_settop
--- 118,125 ----
#define lua_pcallk dll_lua_pcallk
#define lua_getglobal dll_lua_getglobal
#define lua_setglobal dll_lua_setglobal
#endif
+ #define lua_typename dll_lua_typename
#define lua_close dll_lua_close
#define lua_gettop dll_lua_gettop
#define lua_settop dll_lua_settop
***************
*** 151,156 ****
--- 152,158 ----
#define lua_rawset dll_lua_rawset
#define lua_rawseti dll_lua_rawseti
#define lua_setmetatable dll_lua_setmetatable
+ #define lua_next dll_lua_next
/* libs */
#define luaopen_base dll_luaopen_base
#define luaopen_table dll_luaopen_table
***************
*** 177,182 ****
--- 179,185 ----
int (*dll_luaL_loadbufferx) (lua_State *L, const char *buff, size_t sz, const char *name, const char *mode);
int (*dll_luaL_argerror) (lua_State *L, int numarg, const char *extramsg);
#endif
+ void (*dll_luaL_checkany) (lua_State *L, int narg);
const char *(*dll_luaL_checklstring) (lua_State *L, int numArg, size_t *l);
lua_Integer (*dll_luaL_checkinteger) (lua_State *L, int numArg);
lua_Integer (*dll_luaL_optinteger) (lua_State *L, int nArg, lua_Integer def);
***************
*** 201,208 ****
int ctx, lua_CFunction k);
void (*dll_lua_getglobal) (lua_State *L, const char *var);
void (*dll_lua_setglobal) (lua_State *L, const char *var);
- const char *(*dll_lua_typename) (lua_State *L, int tp);
#endif
void (*dll_lua_close) (lua_State *L);
int (*dll_lua_gettop) (lua_State *L);
void (*dll_lua_settop) (lua_State *L, int idx);
--- 204,211 ----
int ctx, lua_CFunction k);
void (*dll_lua_getglobal) (lua_State *L, const char *var);
void (*dll_lua_setglobal) (lua_State *L, const char *var);
#endif
+ const char *(*dll_lua_typename) (lua_State *L, int tp);
void (*dll_lua_close) (lua_State *L);
int (*dll_lua_gettop) (lua_State *L);
void (*dll_lua_settop) (lua_State *L, int idx);
***************
*** 235,240 ****
--- 238,244 ----
void (*dll_lua_rawset) (lua_State *L, int idx);
void (*dll_lua_rawseti) (lua_State *L, int idx, int n);
int (*dll_lua_setmetatable) (lua_State *L, int objindex);
+ int (*dll_lua_next) (lua_State *L, int idx);
/* libs */
int (*dll_luaopen_base) (lua_State *L);
int (*dll_luaopen_table) (lua_State *L);
***************
*** 268,273 ****
--- 272,278 ----
{"luaL_loadbufferx", (luaV_function) &dll_luaL_loadbufferx},
{"luaL_argerror", (luaV_function) &dll_luaL_argerror},
#endif
+ {"luaL_checkany", (luaV_function) &dll_luaL_checkany},
{"luaL_checklstring", (luaV_function) &dll_luaL_checklstring},
{"luaL_checkinteger", (luaV_function) &dll_luaL_checkinteger},
{"luaL_optinteger", (luaV_function) &dll_luaL_optinteger},
***************
*** 290,297 ****
{"lua_pcallk", (luaV_function) &dll_lua_pcallk},
{"lua_getglobal", (luaV_function) &dll_lua_getglobal},
{"lua_setglobal", (luaV_function) &dll_lua_setglobal},
- {"lua_typename", (luaV_function) &dll_lua_typename},
#endif
{"lua_close", (luaV_function) &dll_lua_close},
{"lua_gettop", (luaV_function) &dll_lua_gettop},
{"lua_settop", (luaV_function) &dll_lua_settop},
--- 295,302 ----
{"lua_pcallk", (luaV_function) &dll_lua_pcallk},
{"lua_getglobal", (luaV_function) &dll_lua_getglobal},
{"lua_setglobal", (luaV_function) &dll_lua_setglobal},
#endif
+ {"lua_typename", (luaV_function) &dll_lua_typename},
{"lua_close", (luaV_function) &dll_lua_close},
{"lua_gettop", (luaV_function) &dll_lua_gettop},
{"lua_settop", (luaV_function) &dll_lua_settop},
***************
*** 324,329 ****
--- 329,335 ----
{"lua_rawset", (luaV_function) &dll_lua_rawset},
{"lua_rawseti", (luaV_function) &dll_lua_rawseti},
{"lua_setmetatable", (luaV_function) &dll_lua_setmetatable},
+ {"lua_next", (luaV_function) &dll_lua_next},
/* libs */
{"luaopen_base", (luaV_function) &dll_luaopen_base},
{"luaopen_table", (luaV_function) &dll_luaopen_table},
***************
*** 1828,1834 ****
}
luaV_setrange(L, eap->line1, eap->line2);
luaL_buffinit(L, &b);
! luaL_addlstring(&b, "return function(line) ", 22); /* header */
luaL_addlstring(&b, s, strlen(s));
luaL_addlstring(&b, " end", 4); /* footer */
luaL_pushresult(&b);
--- 1834,1840 ----
}
luaV_setrange(L, eap->line1, eap->line2);
luaL_buffinit(L, &b);
! luaL_addlstring(&b, "return function(line, linenr) ", 30); /* header */
luaL_addlstring(&b, s, strlen(s));
luaL_addlstring(&b, " end", 4); /* footer */
luaL_pushresult(&b);
***************
*** 1845,1851 ****
{
lua_pushvalue(L, -1); /* function */
luaV_pushline(L, curbuf, l); /* current line as arg */
! if (lua_pcall(L, 1, 1, 0))
{
luaV_emsg(L);
break;
--- 1851,1858 ----
{
lua_pushvalue(L, -1); /* function */
luaV_pushline(L, curbuf, l); /* current line as arg */
! lua_pushinteger(L, l); /* current line number as arg */
! if (lua_pcall(L, 2, 1, 0))
{
luaV_emsg(L);
break;
*** ../vim-7.3.493/src/version.c 2012-04-06 13:56:00.000000000 +0200
--- src/version.c 2012-04-06 14:25:11.000000000 +0200
***************
*** 716,717 ****
--- 716,719 ----
{ /* Add new patch number below this line */
+ /**/
+ 494,
/**/
--
Why doesn't Tarzan have a beard?
/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\ an exciting new programming language -- http://www.Zimbu.org ///
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///

124
7.3.495 Normal file
View File

@ -0,0 +1,124 @@
To: vim_dev@googlegroups.com
Subject: Patch 7.3.4
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------
Patch 7.3.495 (after 7.3.492)
Problem: Compiler warnings.
Solution: Add function declaration. Remove "offset" argument.
Files: src/misc1.c
*** ../vim-7.3.494/src/misc1.c 2012-04-06 13:56:00.000000000 +0200
--- src/misc1.c 2012-04-09 20:25:58.000000000 +0200
***************
*** 4972,4977 ****
--- 4972,4978 ----
static int cin_iselse __ARGS((char_u *));
static int cin_isdo __ARGS((char_u *));
static int cin_iswhileofdo __ARGS((char_u *, linenr_T, int));
+ static int cin_is_if_for_while_before_offset __ARGS((char_u *line, int *poffset));
static int cin_iswhileofdo_end __ARGS((int terminated, int ind_maxparen, int ind_maxcomment));
static int cin_isbreak __ARGS((char_u *));
static int cin_is_cpp_baseclass __ARGS((colnr_T *col));
***************
*** 5771,5787 ****
}
/*
! * Check whether in "p" there is an "if", "for" or "while" before offset.
* Return 0 if there is none.
* Otherwise return !0 and update "*poffset" to point to the place where the
* string was found.
*/
static int
! cin_is_if_for_while_before_offset(line, offset, poffset)
char_u *line;
- size_t offset;
int *poffset;
{
if (offset-- < 2)
return 0;
--- 5772,5788 ----
}
/*
! * Check whether in "p" there is an "if", "for" or "while" before "*poffset".
* Return 0 if there is none.
* Otherwise return !0 and update "*poffset" to point to the place where the
* string was found.
*/
static int
! cin_is_if_for_while_before_offset(line, poffset)
char_u *line;
int *poffset;
{
+ int offset = *poffset;
if (offset-- < 2)
return 0;
***************
*** 5805,5812 ****
goto probablyFound;
}
}
-
return 0;
probablyFound:
if (!offset || !vim_isIDc(line[offset - 1]))
{
--- 5806,5813 ----
goto probablyFound;
}
}
return 0;
+
probablyFound:
if (!offset || !vim_isIDc(line[offset - 1]))
{
***************
*** 6890,6897 ****
line = ml_get(outermost.lnum);
is_if_for_while =
! cin_is_if_for_while_before_offset(line, outermost.col,
! &outermost.col);
}
amount = skip_label(our_paren_pos.lnum, &look, ind_maxcomment);
--- 6891,6897 ----
line = ml_get(outermost.lnum);
is_if_for_while =
! cin_is_if_for_while_before_offset(line, &outermost.col);
}
amount = skip_label(our_paren_pos.lnum, &look, ind_maxcomment);
*** ../vim-7.3.494/src/version.c 2012-04-06 14:30:55.000000000 +0200
--- src/version.c 2012-04-09 20:41:44.000000000 +0200
***************
*** 716,717 ****
--- 716,719 ----
{ /* Add new patch number below this line */
+ /**/
+ 495,
/**/
--
[clop clop]
GUARD #1: Halt! Who goes there?
ARTHUR: It is I, Arthur, son of Uther Pendragon, from the castle of
Camelot. King of the Britons, defeator of the Saxons, sovereign of
all England!
GUARD #1: Pull the other one!
The Quest for the Holy Grail (Monty Python)
/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\ an exciting new programming language -- http://www.Zimbu.org ///
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///

69
7.3.496 Normal file
View File

@ -0,0 +1,69 @@
To: vim_dev@googlegroups.com
Subject: Patch 7.3.496
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------
Patch 7.3.496
Problem: MS-DOS: When "diff" trips over difference in line separators some
tests fail.
Solution: Make some .ok files use unix line separators. (David Pope)
Files: src/testdir/Make_dos.mak, src/testdir/Make_ming.mak
*** ../vim-7.3.495/src/testdir/Make_dos.mak 2012-04-05 16:56:38.000000000 +0200
--- src/testdir/Make_dos.mak 2012-04-09 21:23:43.000000000 +0200
***************
*** 52,58 ****
fixff:
-$(VIMPROG) -u dos.vim --noplugin "+argdo set ff=dos|upd" +q *.in *.ok
! -$(VIMPROG) -u dos.vim --noplugin "+argdo set ff=unix|upd" +q dotest.in
clean:
-del *.out
--- 52,59 ----
fixff:
-$(VIMPROG) -u dos.vim --noplugin "+argdo set ff=dos|upd" +q *.in *.ok
! -$(VIMPROG) -u dos.vim --noplugin "+argdo set ff=unix|upd" +q \
! dotest.in test60.ok test71.ok test74.ok
clean:
-del *.out
*** ../vim-7.3.495/src/testdir/Make_ming.mak 2012-04-05 16:56:38.000000000 +0200
--- src/testdir/Make_ming.mak 2012-04-09 21:25:55.000000000 +0200
***************
*** 75,80 ****
--- 75,82 ----
fixff:
-$(VIMPROG) -u dos.vim --noplugin "+argdo set ff=dos|upd" +q *.in *.ok
+ -$(VIMPROG) -u dos.vim --noplugin "+argdo set ff=unix|upd" +q \
+ dotest.in test60.ok test71.ok test74.ok
clean:
-$(DEL) *.out
*** ../vim-7.3.495/src/version.c 2012-04-09 20:42:20.000000000 +0200
--- src/version.c 2012-04-13 19:10:04.000000000 +0200
***************
*** 716,717 ****
--- 716,719 ----
{ /* Add new patch number below this line */
+ /**/
+ 496,
/**/
--
There are 2 kinds of people in my world: those who know Unix, Perl, Vim, GNU,
Linux, etc, and those who know COBOL. It gets very difficult for me at
parties, not knowing which group to socialise with :-)
Sitaram Chamarty
/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\ an exciting new programming language -- http://www.Zimbu.org ///
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///

50
7.3.497 Normal file
View File

@ -0,0 +1,50 @@
To: vim_dev@googlegroups.com
Subject: Patch 7.3.497
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------
Patch 7.3.497
Problem: Crash when doing ":python print" and compiled with gcc and
the optimizer enabled.
Solution: Avoid the crash, doesn't really fix the problem. (Christian
Brabandt)
Files: src/if_py_both.h
*** ../vim-7.3.496/src/if_py_both.h 2012-02-04 20:17:21.000000000 +0100
--- src/if_py_both.h 2012-04-20 13:24:31.000000000 +0200
***************
*** 77,82 ****
--- 77,87 ----
if (!PyArg_ParseTuple(args, "et#", ENC_OPT, &str, &len))
return NULL;
+ /* TODO: This works around a gcc optimizer problem and avoids Vim
+ * from crashing. Should find a real solution. */
+ if (str == NULL)
+ return NULL;
+
Py_BEGIN_ALLOW_THREADS
Python_Lock_Vim();
writer((writefn)(error ? emsg : msg), (char_u *)str, len);
*** ../vim-7.3.496/src/version.c 2012-04-13 19:11:16.000000000 +0200
--- src/version.c 2012-04-20 13:26:22.000000000 +0200
***************
*** 716,717 ****
--- 716,719 ----
{ /* Add new patch number below this line */
+ /**/
+ 497,
/**/
--
There can't be a crisis today, my schedule is already full.
/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\ an exciting new programming language -- http://www.Zimbu.org ///
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///

63
7.3.498 Normal file
View File

@ -0,0 +1,63 @@
To: vim_dev@googlegroups.com
Subject: Patch 7.3.498
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------
Patch 7.3.498
Problem: The behavior of the "- register changes depending on value of
the 'clipboard' option. (Szamotulski)
Solution: Also set the "- register when the register is "*" or "+".
(Christian Brabandt)
Files: src/ops.c
*** ../vim-7.3.497/src/ops.c 2012-03-23 14:16:19.000000000 +0100
--- src/ops.c 2012-04-20 13:36:32.000000000 +0200
***************
*** 1720,1728 ****
did_yank = TRUE;
}
! /* Yank into small delete register when no register specified and the
! * delete is within one line. */
! if (oap->regname == 0 && oap->motion_type != MLINE
&& oap->line_count == 1)
{
oap->regname = '-';
--- 1720,1733 ----
did_yank = TRUE;
}
! /* Yank into small delete register when no named register specified
! * and the delete is within one line. */
! if ((
! #ifdef FEAT_CLIPBOARD
! ((clip_unnamed & CLIP_UNNAMED) && oap->regname == '*') ||
! ((clip_unnamed & CLIP_UNNAMED_PLUS) && oap->regname == '+') ||
! #endif
! oap->regname == 0) && oap->motion_type != MLINE
&& oap->line_count == 1)
{
oap->regname = '-';
*** ../vim-7.3.497/src/version.c 2012-04-20 13:31:16.000000000 +0200
--- src/version.c 2012-04-20 13:45:26.000000000 +0200
***************
*** 716,717 ****
--- 716,719 ----
{ /* Add new patch number below this line */
+ /**/
+ 498,
/**/
--
Did you ever stop to think... and forget to start again?
-- Steven Wright
/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\ an exciting new programming language -- http://www.Zimbu.org ///
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///

84
7.3.499 Normal file
View File

@ -0,0 +1,84 @@
To: vim_dev@googlegroups.com
Subject: Patch 7.3.499
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------
Patch 7.3.499
Problem: When using any interface language when Vim is waiting for a child
process it gets confused by a child process started through the
interface.
Solution: Always used waitpid() instead of wait(). (Yasuhiro Matsumoto)
Files: src/os_unix.c
*** ../vim-7.3.498/src/os_unix.c 2012-02-05 22:51:27.000000000 +0100
--- src/os_unix.c 2012-04-20 15:47:17.000000000 +0200
***************
*** 3734,3757 ****
while (wait_pid != child)
{
! # ifdef _THREAD_SAFE
! /* Ugly hack: when compiled with Python threads are probably
! * used, in which case wait() sometimes hangs for no obvious
! * reason. Use waitpid() instead and loop (like the GUI). */
! # ifdef __NeXT__
wait_pid = wait4(child, status, WNOHANG, (struct rusage *)0);
! # else
wait_pid = waitpid(child, status, WNOHANG);
! # endif
if (wait_pid == 0)
{
/* Wait for 1/100 sec before trying again. */
mch_delay(10L, TRUE);
continue;
}
- # else
- wait_pid = wait(status);
- # endif
if (wait_pid <= 0
# ifdef ECHILD
&& errno == ECHILD
--- 3734,3754 ----
while (wait_pid != child)
{
! /* When compiled with Python threads are probably used, in which case
! * wait() sometimes hangs for no obvious reason. Use waitpid()
! * instead and loop (like the GUI). Also needed for other interfaces,
! * they might call system(). */
! # ifdef __NeXT__
wait_pid = wait4(child, status, WNOHANG, (struct rusage *)0);
! # else
wait_pid = waitpid(child, status, WNOHANG);
! # endif
if (wait_pid == 0)
{
/* Wait for 1/100 sec before trying again. */
mch_delay(10L, TRUE);
continue;
}
if (wait_pid <= 0
# ifdef ECHILD
&& errno == ECHILD
*** ../vim-7.3.498/src/version.c 2012-04-20 13:46:02.000000000 +0200
--- src/version.c 2012-04-20 15:54:05.000000000 +0200
***************
*** 716,717 ****
--- 716,719 ----
{ /* Add new patch number below this line */
+ /**/
+ 499,
/**/
--
It's not hard to meet expenses, they're everywhere.
/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\ an exciting new programming language -- http://www.Zimbu.org ///
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///

46
7.3.500 Normal file
View File

@ -0,0 +1,46 @@
To: vim_dev@googlegroups.com
Subject: Patch 7.3.500
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------
Patch 7.3.500
Problem: Ming makefile unconditionally sets WINVER.
Solution: Only defined when not already defined. (Yasuhiro Matsumoto)
Files: src/Make_ming.mak
*** ../vim-7.3.499/src/Make_ming.mak 2012-03-28 17:43:06.000000000 +0200
--- src/Make_ming.mak 2012-04-20 16:03:50.000000000 +0200
***************
*** 51,57 ****
--- 51,59 ----
# set to yes to enable OLE support
OLE=no
# Set the default $(WINVER) to make it work with pre-Win2k
+ ifndef WINVER
WINVER = 0x0400
+ endif
# Set to yes to enable Cscope support
CSCOPE=yes
# Set to yes to enable Netbeans support
*** ../vim-7.3.499/src/version.c 2012-04-20 15:55:10.000000000 +0200
--- src/version.c 2012-04-20 16:12:34.000000000 +0200
***************
*** 716,717 ****
--- 716,719 ----
{ /* Add new patch number below this line */
+ /**/
+ 500,
/**/
--
Life is a gift, living is an art. (Bram Moolenaar)
/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\ an exciting new programming language -- http://www.Zimbu.org ///
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///

63
7.3.501 Normal file
View File

@ -0,0 +1,63 @@
To: vim_dev@googlegroups.com
Subject: Patch 7.3.501
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------
Patch 7.3.501
Problem: Error for "flush" not being defined when using Ruby command.
Solution: Defined "flush" as a no-op method. (Kent Sibilev)
Files: src/if_ruby.c
*** ../vim-7.3.500/src/if_ruby.c 2011-08-04 19:34:55.000000000 +0200
--- src/if_ruby.c 2012-04-20 16:18:56.000000000 +0200
***************
*** 1238,1243 ****
--- 1238,1248 ----
return Qnil;
}
+ static VALUE f_nop(VALUE self)
+ {
+ return Qnil;
+ }
+
static VALUE f_p(int argc, VALUE *argv, VALUE self UNUSED)
{
int i;
***************
*** 1259,1264 ****
--- 1264,1270 ----
rb_stdout = rb_obj_alloc(rb_cObject);
rb_define_singleton_method(rb_stdout, "write", vim_message, 1);
+ rb_define_singleton_method(rb_stdout, "flush", f_nop, 0);
rb_define_global_function("p", f_p, -1);
}
*** ../vim-7.3.500/src/version.c 2012-04-20 16:13:21.000000000 +0200
--- src/version.c 2012-04-20 16:19:03.000000000 +0200
***************
*** 716,717 ****
--- 716,719 ----
{ /* Add new patch number below this line */
+ /**/
+ 501,
/**/
--
Q: What do you call a fish without an eye?
A: fsh!
Q: What do you call a deer with no eyes?
A: no eye deer.
Q: What do you call a deer with no eyes and no legs?
A: still no eye deer.
/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\ an exciting new programming language -- http://www.Zimbu.org ///
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///

67
7.3.502 Normal file
View File

@ -0,0 +1,67 @@
To: vim_dev@googlegroups.com
Subject: Patch 7.3.502
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------
Patch 7.3.502
Problem: Netbeans insert halfway a line actually appends to the line.
Solution: Insert halfway the line. (Brian Victor)
Files: src/netbeans.c
*** ../vim-7.3.501/src/netbeans.c 2012-01-10 22:31:26.000000000 +0100
--- src/netbeans.c 2012-04-20 19:44:31.000000000 +0200
***************
*** 1812,1825 ****
char_u *oldline = ml_get(lnum);
char_u *newline;
! /* Insert halfway a line. For simplicity we assume we
! * need to append to the line. */
newline = alloc_check(
(unsigned)(STRLEN(oldline) + len + 1));
if (newline != NULL)
{
! STRCPY(newline, oldline);
STRCAT(newline, args);
ml_replace(lnum, newline, FALSE);
}
}
--- 1812,1826 ----
char_u *oldline = ml_get(lnum);
char_u *newline;
! /* Insert halfway a line. */
newline = alloc_check(
(unsigned)(STRLEN(oldline) + len + 1));
if (newline != NULL)
{
! mch_memmove(newline, oldline, (size_t)pos->col);
! newline[pos->col] = NUL;
STRCAT(newline, args);
+ STRCAT(newline, oldline + pos->col);
ml_replace(lnum, newline, FALSE);
}
}
*** ../vim-7.3.501/src/version.c 2012-04-20 18:05:42.000000000 +0200
--- src/version.c 2012-04-20 19:46:48.000000000 +0200
***************
*** 716,717 ****
--- 716,719 ----
{ /* Add new patch number below this line */
+ /**/
+ 502,
/**/
--
Time flies like an arrow.
Fruit flies like a banana.
/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\ an exciting new programming language -- http://www.Zimbu.org ///
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///

51
7.3.503 Normal file
View File

@ -0,0 +1,51 @@
To: vim_dev@googlegroups.com
Subject: Patch 7.3.503
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------
Patch 7.3.503 (after 7.3.501)
Problem: Warning for unused argument.
Solution: Add UNUSED.
Files: src/if_ruby.c
*** ../vim-7.3.502/src/if_ruby.c 2012-04-20 18:05:42.000000000 +0200
--- src/if_ruby.c 2012-04-25 12:26:38.000000000 +0200
***************
*** 1238,1244 ****
return Qnil;
}
! static VALUE f_nop(VALUE self)
{
return Qnil;
}
--- 1238,1244 ----
return Qnil;
}
! static VALUE f_nop(VALUE self UNUSED)
{
return Qnil;
}
*** ../vim-7.3.502/src/version.c 2012-04-20 19:47:00.000000000 +0200
--- src/version.c 2012-04-25 12:27:30.000000000 +0200
***************
*** 716,717 ****
--- 716,719 ----
{ /* Add new patch number below this line */
+ /**/
+ 503,
/**/
--
Why isn't there mouse-flavored cat food?
/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\ an exciting new programming language -- http://www.Zimbu.org ///
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///

87
7.3.504 Normal file
View File

@ -0,0 +1,87 @@
To: vim_dev@googlegroups.com
Subject: Patch 7.3.504
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------
Patch 7.3.504
Problem: Commands in help files are not highlighted.
Solution: Allow for commands in backticks. Adjust CTRL-] to remove the
backticks.
Files: src/ex_cmds.c
*** ../vim-7.3.503/src/ex_cmds.c 2012-04-05 16:04:58.000000000 +0200
--- src/ex_cmds.c 2012-04-25 12:51:41.000000000 +0200
***************
*** 3421,3427 ****
* and re-attach to buffer, perhaps.
*/
if (curwin->w_s == &(curwin->w_buffer->b_s))
! curwin->w_s = &(buf->b_s);
#endif
curwin->w_buffer = buf;
curbuf = buf;
--- 3421,3427 ----
* and re-attach to buffer, perhaps.
*/
if (curwin->w_s == &(curwin->w_buffer->b_s))
! curwin->w_s = &(buf->b_s);
#endif
curwin->w_buffer = buf;
curbuf = buf;
***************
*** 5965,5970 ****
--- 5965,5993 ----
break;
}
*d = NUL;
+
+ if (*IObuff == '`')
+ {
+ if (d > IObuff + 2 && d[-1] == '`')
+ {
+ /* remove the backticks from `command` */
+ mch_memmove(IObuff, IObuff + 1, STRLEN(IObuff));
+ d[-2] = NUL;
+ }
+ else if (d > IObuff + 3 && d[-2] == '`' && d[-1] == ',')
+ {
+ /* remove the backticks and comma from `command`, */
+ mch_memmove(IObuff, IObuff + 1, STRLEN(IObuff));
+ d[-3] = NUL;
+ }
+ else if (d > IObuff + 4 && d[-3] == '`'
+ && d[-2] == '\\' && d[-1] == '.')
+ {
+ /* remove the backticks and dot from `command`\. */
+ mch_memmove(IObuff, IObuff + 1, STRLEN(IObuff));
+ d[-4] = NUL;
+ }
+ }
}
}
*** ../vim-7.3.503/src/version.c 2012-04-25 12:28:05.000000000 +0200
--- src/version.c 2012-04-25 12:46:43.000000000 +0200
***************
*** 716,717 ****
--- 716,719 ----
{ /* Add new patch number below this line */
+ /**/
+ 504,
/**/
--
TIM: That is not an ordinary rabbit ... 'tis the most foul cruel and
bad-tempered thing you ever set eyes on.
ROBIN: You tit. I soiled my armour I was so scared!
"Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD
/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\ an exciting new programming language -- http://www.Zimbu.org ///
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///

116
7.3.505 Normal file
View File

@ -0,0 +1,116 @@
To: vim_dev@googlegroups.com
Subject: Patch 7.3.505
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------
Patch 7.3.505
Problem: Test 11 fails on MS-Windows in some versions.
Solution: Fix #ifdefs for whether filtering through a pipe is possible. Move
setting b_no_eol_lnum back to where it was before patch 7.3.124.
(David Pope)
Files: src/feature.h, src/eval.c, src/ex_cmds.c, src/fileio.c
*** ../vim-7.3.504/src/feature.h 2011-10-20 21:09:25.000000000 +0200
--- src/feature.h 2012-04-25 16:44:26.000000000 +0200
***************
*** 1316,1318 ****
--- 1316,1326 ----
#ifdef FEAT_NORMAL
# define FEAT_PERSISTENT_UNDO
#endif
+
+ /*
+ * +filterpipe
+ */
+ #if (defined(UNIX) && !defined(USE_SYSTEM)) \
+ || (defined(WIN3264) && defined(FEAT_GUI_W32))
+ # define FEAT_FILTERPIPE
+ #endif
*** ../vim-7.3.504/src/eval.c 2012-04-05 16:53:55.000000000 +0200
--- src/eval.c 2012-04-25 16:43:53.000000000 +0200
***************
*** 12090,12096 ****
#ifdef FEAT_SEARCHPATH
"file_in_path",
#endif
! #if (defined(UNIX) && !defined(USE_SYSTEM)) || defined(WIN3264)
"filterpipe",
#endif
#ifdef FEAT_FIND_ID
--- 12090,12096 ----
#ifdef FEAT_SEARCHPATH
"file_in_path",
#endif
! #ifdef FEAT_FILTERPIPE
"filterpipe",
#endif
#ifdef FEAT_FIND_ID
*** ../vim-7.3.504/src/ex_cmds.c 2012-04-25 12:57:23.000000000 +0200
--- src/ex_cmds.c 2012-04-25 16:46:02.000000000 +0200
***************
*** 1113,1119 ****
if (do_out)
shell_flags |= SHELL_DOOUT;
! #if (!defined(USE_SYSTEM) && defined(UNIX)) || defined(WIN3264)
if (!do_in && do_out && !p_stmp)
{
/* Use a pipe to fetch stdout of the command, do not use a temp file. */
--- 1113,1119 ----
if (do_out)
shell_flags |= SHELL_DOOUT;
! #ifdef FEAT_FILTERPIPE
if (!do_in && do_out && !p_stmp)
{
/* Use a pipe to fetch stdout of the command, do not use a temp file. */
*** ../vim-7.3.504/src/fileio.c 2012-02-29 18:22:03.000000000 +0100
--- src/fileio.c 2012-04-25 16:40:37.000000000 +0200
***************
*** 2655,2664 ****
}
#endif
- /* Reset now, following writes should not omit the EOL. Also, the line
- * number will become invalid because of edits. */
- curbuf->b_no_eol_lnum = 0;
-
if (recoverymode && error)
return FAIL;
return OK;
--- 2655,2660 ----
***************
*** 5098,5103 ****
--- 5094,5101 ----
{
aco_save_T aco;
+ curbuf->b_no_eol_lnum = 0; /* in case it was set by the previous read */
+
/*
* Apply POST autocommands.
* Careful: The autocommands may call buf_write() recursively!
*** ../vim-7.3.504/src/version.c 2012-04-25 12:57:23.000000000 +0200
--- src/version.c 2012-04-25 16:49:50.000000000 +0200
***************
*** 716,717 ****
--- 716,719 ----
{ /* Add new patch number below this line */
+ /**/
+ 505,
/**/
--
Lose weight, NEVER Diet again with
The "Invisible Weight Loss Patch"
(spam e-mail)
/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\ an exciting new programming language -- http://www.Zimbu.org ///
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///

100
7.3.506 Normal file
View File

@ -0,0 +1,100 @@
To: vim_dev@googlegroups.com
Subject: Patch 7.3.506
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------
Patch 7.3.506
Problem: GTK gives an error when selecting a non-existent file.
Solution: Add a handler to avoid the error. (Christian Brabandt)
Files: src/gui_gtk.c
*** ../vim-7.3.505/src/gui_gtk.c 2011-06-26 04:48:56.000000000 +0200
--- src/gui_gtk.c 2012-04-25 17:08:58.000000000 +0200
***************
*** 90,95 ****
--- 90,100 ----
static void entry_activate_cb(GtkWidget *widget, gpointer data);
static void entry_changed_cb(GtkWidget *entry, GtkWidget *dialog);
static void find_replace_cb(GtkWidget *widget, gpointer data);
+ static void recent_func_log_func(
+ const gchar *log_domain,
+ GLogLevelFlags log_level,
+ const gchar *message,
+ gpointer user_data);
#if defined(FEAT_TOOLBAR)
/*
***************
*** 839,844 ****
--- 844,851 ----
GtkWidget *fc;
#endif
char_u dirbuf[MAXPATHL];
+ guint log_handler;
+ const gchar *domain = "Gtk";
title = CONVERT_TO_UTF8(title);
***************
*** 853,858 ****
--- 860,870 ----
/* If our pointer is currently hidden, then we should show it. */
gui_mch_mousehide(FALSE);
+ /* Hack: The GTK file dialog warns when it can't access a new file, this
+ * makes it shut up. http://bugzilla.gnome.org/show_bug.cgi?id=664587 */
+ log_handler = g_log_set_handler(domain, G_LOG_LEVEL_WARNING,
+ recent_func_log_func, NULL);
+
#ifdef USE_FILE_CHOOSER
/* We create the dialog each time, so that the button text can be "Open"
* or "Save" according to the action. */
***************
*** 916,921 ****
--- 928,934 ----
gtk_widget_show(gui.filedlg);
gtk_main();
#endif
+ g_log_remove_handler(domain, log_handler);
CONVERT_TO_UTF8_FREE(title);
if (gui.browse_fname == NULL)
***************
*** 1882,1884 ****
--- 1895,1908 ----
* backwards compatibility anyway. */
do_cmdline_cmd((char_u *)"emenu ToolBar.FindHelp");
}
+
+ static void
+ recent_func_log_func(const gchar *log_domain UNUSED,
+ GLogLevelFlags log_level UNUSED,
+ const gchar *message UNUSED,
+ gpointer user_data UNUSED)
+ {
+ /* We just want to suppress the warnings. */
+ /* http://bugzilla.gnome.org/show_bug.cgi?id=664587 */
+ }
+
*** ../vim-7.3.505/src/version.c 2012-04-25 16:50:44.000000000 +0200
--- src/version.c 2012-04-25 17:08:28.000000000 +0200
***************
*** 716,717 ****
--- 716,719 ----
{ /* Add new patch number below this line */
+ /**/
+ 506,
/**/
--
Compilation process failed successfully.
/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\ an exciting new programming language -- http://www.Zimbu.org ///
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///

149
7.3.507 Normal file
View File

@ -0,0 +1,149 @@
To: vim_dev@googlegroups.com
Subject: Patch 7.3.507
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------
Patch 7.3.507
Problem: When exiting with unsaved changes, selecting an existing file in
the file dialog, there is no dialog to ask whether the existing
file should be overwritten. (Felipe G. Nievinski)
Solution: Call check_overwrite() before writing. (Christian Brabandt)
Files: src/ex_cmds.c, src/ex_cmds2.c, src/proto/ex_cmds.pro
*** ../vim-7.3.506/src/ex_cmds.c 2012-04-25 16:50:44.000000000 +0200
--- src/ex_cmds.c 2012-04-25 17:19:53.000000000 +0200
***************
*** 25,31 ****
static int read_viminfo_up_to_marks __ARGS((vir_T *virp, int forceit, int writing));
#endif
- static int check_overwrite __ARGS((exarg_T *eap, buf_T *buf, char_u *fname, char_u *ffname, int other));
static int check_readonly __ARGS((int *forceit, buf_T *buf));
#ifdef FEAT_AUTOCMD
static void delbuf_msg __ARGS((char_u *name));
--- 25,30 ----
***************
*** 2722,2728 ****
* May set eap->forceit if a dialog says it's OK to overwrite.
* Return OK if it's OK, FAIL if it is not.
*/
! static int
check_overwrite(eap, buf, fname, ffname, other)
exarg_T *eap;
buf_T *buf;
--- 2721,2727 ----
* May set eap->forceit if a dialog says it's OK to overwrite.
* Return OK if it's OK, FAIL if it is not.
*/
! int
check_overwrite(eap, buf, fname, ffname, other)
exarg_T *eap;
buf_T *buf;
*** ../vim-7.3.506/src/ex_cmds2.c 2012-03-23 18:39:10.000000000 +0100
--- src/ex_cmds2.c 2012-04-25 17:24:37.000000000 +0200
***************
*** 1489,1494 ****
--- 1489,1495 ----
char_u buff[DIALOG_MSG_SIZE];
int ret;
buf_T *buf2;
+ exarg_T ea;
dialog_msg(buff, _("Save changes to \"%s\"?"),
(buf->b_fname != NULL) ?
***************
*** 1498,1510 ****
else
ret = vim_dialog_yesnocancel(VIM_QUESTION, NULL, buff, 1);
if (ret == VIM_YES)
{
#ifdef FEAT_BROWSE
/* May get file name, when there is none */
browse_save_fname(buf);
#endif
! if (buf->b_fname != NULL) /* didn't hit Cancel */
(void)buf_write_all(buf, FALSE);
}
else if (ret == VIM_NO)
--- 1499,1517 ----
else
ret = vim_dialog_yesnocancel(VIM_QUESTION, NULL, buff, 1);
+ /* Init ea pseudo-structure, this is needed for the check_overwrite()
+ * function. */
+ ea.append = ea.forceit = FALSE;
+
if (ret == VIM_YES)
{
#ifdef FEAT_BROWSE
/* May get file name, when there is none */
browse_save_fname(buf);
#endif
! if (buf->b_fname != NULL && check_overwrite(&ea, buf,
! buf->b_fname, buf->b_ffname, FALSE) == OK)
! /* didn't hit Cancel */
(void)buf_write_all(buf, FALSE);
}
else if (ret == VIM_NO)
***************
*** 1532,1538 ****
/* May get file name, when there is none */
browse_save_fname(buf2);
#endif
! if (buf2->b_fname != NULL) /* didn't hit Cancel */
(void)buf_write_all(buf2, FALSE);
#ifdef FEAT_AUTOCMD
/* an autocommand may have deleted the buffer */
--- 1539,1547 ----
/* May get file name, when there is none */
browse_save_fname(buf2);
#endif
! if (buf2->b_fname != NULL && check_overwrite(&ea, buf2,
! buf2->b_fname, buf2->b_ffname, FALSE) == OK)
! /* didn't hit Cancel */
(void)buf_write_all(buf2, FALSE);
#ifdef FEAT_AUTOCMD
/* an autocommand may have deleted the buffer */
*** ../vim-7.3.506/src/proto/ex_cmds.pro 2010-08-15 21:57:28.000000000 +0200
--- src/proto/ex_cmds.pro 2012-04-25 17:25:47.000000000 +0200
***************
*** 23,28 ****
--- 23,29 ----
void ex_update __ARGS((exarg_T *eap));
void ex_write __ARGS((exarg_T *eap));
int do_write __ARGS((exarg_T *eap));
+ int check_overwrite __ARGS((exarg_T *eap, buf_T *buf, char_u *fname, char_u *ffname, int other));
void ex_wnext __ARGS((exarg_T *eap));
void do_wqall __ARGS((exarg_T *eap));
int not_writing __ARGS((void));
*** ../vim-7.3.506/src/version.c 2012-04-25 17:10:12.000000000 +0200
--- src/version.c 2012-04-25 17:17:30.000000000 +0200
***************
*** 716,717 ****
--- 716,719 ----
{ /* Add new patch number below this line */
+ /**/
+ 507,
/**/
--
BROTHER MAYNARD: Armaments Chapter Two Verses Nine to Twenty One.
ANOTHER MONK: And St. Attila raised his hand grenade up on high saying "O
Lord bless this thy hand grenade that with it thou mayest
blow thine enemies to tiny bits, in thy mercy. "and the Lord
did grin and people did feast upon the lambs and sloths and
carp and anchovies and orang-utans and breakfast cereals and
fruit bats and...
BROTHER MAYNARD: Skip a bit brother ...
"Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD
/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\ an exciting new programming language -- http://www.Zimbu.org ///
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///

85
7.3.508 Normal file
View File

@ -0,0 +1,85 @@
To: vim_dev@googlegroups.com
Subject: Patch 7.3.508
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------
Patch 7.3.508
Problem: Default for v:register is not set.
Solution: Init v:register in eval_init(). Correct for 'clipboard' before the
main loop. (Ingo Karkat)
Files: src/eval.c, src/main.c
*** ../vim-7.3.507/src/eval.c 2012-04-25 16:50:44.000000000 +0200
--- src/eval.c 2012-04-25 17:56:41.000000000 +0200
***************
*** 880,885 ****
--- 880,886 ----
hash_add(&compat_hashtab, p->vv_di.di_key);
}
set_vim_var_nr(VV_SEARCHFORWARD, 1L);
+ set_reg_var(0); /* default for v:register is not 0 but '"' */
#ifdef EBCDIC
/*
*** ../vim-7.3.507/src/main.c 2012-03-28 17:10:26.000000000 +0200
--- src/main.c 2012-04-25 18:01:28.000000000 +0200
***************
*** 928,933 ****
--- 928,945 ----
TIME_MSG("VimEnter autocommands");
#endif
+ #if defined(FEAT_EVAL) && defined(FEAT_CLIPBOARD)
+ /* Adjust default register name for "unnamed" in 'clipboard'. Can only be
+ * done after the clipboard is available and all initial commands that may
+ * modify the 'clipboard' setting have run; i.e. just before entering the
+ * main loop. */
+ {
+ int default_regname = 0;
+ adjust_clip_reg(&default_regname);
+ set_reg_var(default_regname);
+ }
+ #endif
+
#if defined(FEAT_DIFF) && defined(FEAT_SCROLLBIND)
/* When a startup script or session file setup for diff'ing and
* scrollbind, sync the scrollbind now. */
***************
*** 1357,1363 ****
{
apply_autocmds(EVENT_BUFWINLEAVE, buf->b_fname,
buf->b_fname, FALSE, buf);
! buf->b_changedtick = -1; /* note that we did it already */
/* start all over, autocommands may mess up the lists */
next_tp = first_tabpage;
break;
--- 1369,1375 ----
{
apply_autocmds(EVENT_BUFWINLEAVE, buf->b_fname,
buf->b_fname, FALSE, buf);
! buf->b_changedtick = -1; /* note that we did it already */
/* start all over, autocommands may mess up the lists */
next_tp = first_tabpage;
break;
*** ../vim-7.3.507/src/version.c 2012-04-25 17:32:14.000000000 +0200
--- src/version.c 2012-04-25 18:00:28.000000000 +0200
***************
*** 716,717 ****
--- 716,719 ----
{ /* Add new patch number below this line */
+ /**/
+ 508,
/**/
--
I wonder, do vegetarians eat fruit bats?
/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\ an exciting new programming language -- http://www.Zimbu.org ///
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///

304
7.3.509 Normal file
View File

@ -0,0 +1,304 @@
To: vim_dev@googlegroups.com
Subject: Patch 7.3.509
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------
Patch 7.3.509
Problem: ":vimgrep" fails when 'autochdir' is set.
Solution: A more generic solution for changing directory. (Ben Fritz)
Files: src/quickfix.c
*** ../vim-7.3.508/src/quickfix.c 2012-03-07 20:13:44.000000000 +0100
--- src/quickfix.c 2012-04-25 18:52:24.000000000 +0200
***************
*** 130,138 ****
static void qf_fill_buffer __ARGS((qf_info_T *qi));
#endif
static char_u *get_mef_name __ARGS((void));
! static buf_T *load_dummy_buffer __ARGS((char_u *fname));
! static void wipe_dummy_buffer __ARGS((buf_T *buf));
! static void unload_dummy_buffer __ARGS((buf_T *buf));
static qf_info_T *ll_get_or_alloc_list __ARGS((win_T *));
/* Quickfix window check helper macro */
--- 130,139 ----
static void qf_fill_buffer __ARGS((qf_info_T *qi));
#endif
static char_u *get_mef_name __ARGS((void));
! static void restore_start_dir __ARGS((char_u *dirname_start));
! static buf_T *load_dummy_buffer __ARGS((char_u *fname, char_u *dirname_start, char_u *resulting_dir));
! static void wipe_dummy_buffer __ARGS((buf_T *buf, char_u *dirname_start));
! static void unload_dummy_buffer __ARGS((buf_T *buf, char_u *dirname_start));
static qf_info_T *ll_get_or_alloc_list __ARGS((win_T *));
/* Quickfix window check helper macro */
***************
*** 3237,3255 ****
/* Load file into a buffer, so that 'fileencoding' is detected,
* autocommands applied, etc. */
! buf = load_dummy_buffer(fname);
!
! /* When autocommands changed directory: go back. We assume it was
! * ":lcd %:p:h". */
! mch_dirname(dirname_now, MAXPATHL);
! if (STRCMP(dirname_start, dirname_now) != 0)
! {
! exarg_T ea;
!
! ea.arg = dirname_start;
! ea.cmdidx = CMD_lcd;
! ex_cd(&ea);
! }
p_mls = save_mls;
#if defined(FEAT_AUTOCMD) && defined(FEAT_SYN_HL)
--- 3238,3244 ----
/* Load file into a buffer, so that 'fileencoding' is detected,
* autocommands applied, etc. */
! buf = load_dummy_buffer(fname, dirname_start, dirname_now);
p_mls = save_mls;
#if defined(FEAT_AUTOCMD) && defined(FEAT_SYN_HL)
***************
*** 3320,3326 ****
{
/* Never keep a dummy buffer if there is another buffer
* with the same name. */
! wipe_dummy_buffer(buf);
buf = NULL;
}
else if (!cmdmod.hide
--- 3309,3315 ----
{
/* Never keep a dummy buffer if there is another buffer
* with the same name. */
! wipe_dummy_buffer(buf, dirname_start);
buf = NULL;
}
else if (!cmdmod.hide
***************
*** 3336,3347 ****
* many swap files. */
if (!found_match)
{
! wipe_dummy_buffer(buf);
buf = NULL;
}
else if (buf != first_match_buf || (flags & VGR_NOJUMP))
{
! unload_dummy_buffer(buf);
buf = NULL;
}
}
--- 3325,3336 ----
* many swap files. */
if (!found_match)
{
! wipe_dummy_buffer(buf, dirname_start);
buf = NULL;
}
else if (buf != first_match_buf || (flags & VGR_NOJUMP))
{
! unload_dummy_buffer(buf, dirname_start);
buf = NULL;
}
}
***************
*** 3487,3499 ****
}
/*
! * Load file "fname" into a dummy buffer and return the buffer pointer.
* Returns NULL if it fails.
- * Must call unload_dummy_buffer() or wipe_dummy_buffer() later!
*/
static buf_T *
! load_dummy_buffer(fname)
char_u *fname;
{
buf_T *newbuf;
buf_T *newbuf_to_wipe = NULL;
--- 3476,3523 ----
}
/*
! * Restore current working directory to "dirname_start" if they differ, taking
! * into account whether it is set locally or globally.
! */
! static void
! restore_start_dir(dirname_start)
! char_u *dirname_start;
! {
! char_u *dirname_now = alloc(MAXPATHL);
!
! if (NULL != dirname_now)
! {
! mch_dirname(dirname_now, MAXPATHL);
! if (STRCMP(dirname_start, dirname_now) != 0)
! {
! /* If the directory has changed, change it back by building up an
! * appropriate ex command and executing it. */
! exarg_T ea;
!
! ea.arg = dirname_start;
! ea.cmdidx = (curwin->w_localdir == NULL) ? CMD_cd : CMD_lcd;
! ex_cd(&ea);
! }
! }
! }
!
! /*
! * Load file "fname" into a dummy buffer and return the buffer pointer,
! * placing the directory resulting from the buffer load into the
! * "resulting_dir" pointer. "resulting_dir" must be allocated by the caller
! * prior to calling this function. Restores directory to "dirname_start" prior
! * to returning, if autocmds or the 'autochdir' option have changed it.
! *
! * If creating the dummy buffer does not fail, must call unload_dummy_buffer()
! * or wipe_dummy_buffer() later!
! *
* Returns NULL if it fails.
*/
static buf_T *
! load_dummy_buffer(fname, dirname_start, resulting_dir)
char_u *fname;
+ char_u *dirname_start; /* in: old directory */
+ char_u *resulting_dir; /* out: new directory */
{
buf_T *newbuf;
buf_T *newbuf_to_wipe = NULL;
***************
*** 3548,3569 ****
wipe_buffer(newbuf_to_wipe, FALSE);
}
if (!buf_valid(newbuf))
return NULL;
if (failed)
{
! wipe_dummy_buffer(newbuf);
return NULL;
}
return newbuf;
}
/*
! * Wipe out the dummy buffer that load_dummy_buffer() created.
*/
static void
! wipe_dummy_buffer(buf)
buf_T *buf;
{
if (curbuf != buf) /* safety check */
{
--- 3572,3604 ----
wipe_buffer(newbuf_to_wipe, FALSE);
}
+ /*
+ * When autocommands/'autochdir' option changed directory: go back.
+ * Let the caller know what the resulting dir was first, in case it is
+ * important.
+ */
+ mch_dirname(resulting_dir, MAXPATHL);
+ restore_start_dir(dirname_start);
+
if (!buf_valid(newbuf))
return NULL;
if (failed)
{
! wipe_dummy_buffer(newbuf, dirname_start);
return NULL;
}
return newbuf;
}
/*
! * Wipe out the dummy buffer that load_dummy_buffer() created. Restores
! * directory to "dirname_start" prior to returning, if autocmds or the
! * 'autochdir' option have changed it.
*/
static void
! wipe_dummy_buffer(buf, dirname_start)
buf_T *buf;
+ char_u *dirname_start;
{
if (curbuf != buf) /* safety check */
{
***************
*** 3583,3600 ****
* new aborting error, interrupt, or uncaught exception. */
leave_cleanup(&cs);
#endif
}
}
/*
! * Unload the dummy buffer that load_dummy_buffer() created.
*/
static void
! unload_dummy_buffer(buf)
buf_T *buf;
{
if (curbuf != buf) /* safety check */
close_buffer(NULL, buf, DOBUF_UNLOAD, FALSE);
}
#if defined(FEAT_EVAL) || defined(PROTO)
--- 3618,3645 ----
* new aborting error, interrupt, or uncaught exception. */
leave_cleanup(&cs);
#endif
+ /* When autocommands/'autochdir' option changed directory: go back. */
+ restore_start_dir(dirname_start);
}
}
/*
! * Unload the dummy buffer that load_dummy_buffer() created. Restores
! * directory to "dirname_start" prior to returning, if autocmds or the
! * 'autochdir' option have changed it.
*/
static void
! unload_dummy_buffer(buf, dirname_start)
buf_T *buf;
+ char_u *dirname_start;
{
if (curbuf != buf) /* safety check */
+ {
close_buffer(NULL, buf, DOBUF_UNLOAD, FALSE);
+
+ /* When autocommands/'autochdir' option changed directory: go back. */
+ restore_start_dir(dirname_start);
+ }
}
#if defined(FEAT_EVAL) || defined(PROTO)
*** ../vim-7.3.508/src/version.c 2012-04-25 18:24:24.000000000 +0200
--- src/version.c 2012-04-25 18:43:10.000000000 +0200
***************
*** 716,717 ****
--- 716,719 ----
{ /* Add new patch number below this line */
+ /**/
+ 509,
/**/
--
Arthur pulls Pin out. The MONK blesses the grenade as ...
ARTHUR: (quietly) One, two, five ...
GALAHAD: Three, sir!
ARTHUR: Three.
"Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD
/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\ an exciting new programming language -- http://www.Zimbu.org ///
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///

53
7.3.510 Normal file
View File

@ -0,0 +1,53 @@
To: vim_dev@googlegroups.com
Subject: Patch 7.3.510
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------
Patch 7.3.510
Problem: Test 77 fails on Solaris 7. (Michael Soyka)
Solution: Replace any tabs with spaces.
Files: src/testdir/test77.in
*** ../vim-7.3.509/src/testdir/test77.in 2011-03-22 18:10:34.000000000 +0100
--- src/testdir/test77.in 2012-04-30 11:30:31.000000000 +0200
***************
*** 21,27 ****
:while i <= 2000000 | call append(i, range(i, i + 99)) | let i += 100 | endwhile
ggdd
:w! Xtest
! :!cksum Xtest > test.out
:qa!
ENDTEST
--- 21,29 ----
:while i <= 2000000 | call append(i, range(i, i + 99)) | let i += 100 | endwhile
ggdd
:w! Xtest
! :r !cksum Xtest
! :s/\s/ /g
! :.w! test.out
:qa!
ENDTEST
*** ../vim-7.3.509/src/version.c 2012-04-25 18:57:17.000000000 +0200
--- src/version.c 2012-04-30 11:33:35.000000000 +0200
***************
*** 716,717 ****
--- 716,719 ----
{ /* Add new patch number below this line */
+ /**/
+ 510,
/**/
--
SIGFUN -- signature too funny (core dumped)
/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\ an exciting new programming language -- http://www.Zimbu.org ///
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///

49
7.3.511 Normal file
View File

@ -0,0 +1,49 @@
To: vim_dev@googlegroups.com
Subject: Patch 7.3.511
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------
Patch 7.3.511
Problem: Using a FileReadCmd autocommand that does ":e! {file}" may cause a
crash. (Christian Brabandt)
Solution: Properly restore curwin->w_s.
Files: src/fileio.c
*** ../vim-7.3.510/src/fileio.c 2012-04-25 16:50:44.000000000 +0200
--- src/fileio.c 2012-04-30 17:04:22.000000000 +0200
***************
*** 8982,8987 ****
--- 8982,8991 ----
&& buf_valid(aco->new_curbuf)
&& aco->new_curbuf->b_ml.ml_mfp != NULL)
{
+ # if defined(FEAT_SYN_HL) || defined(FEAT_SPELL)
+ if (curwin->w_s == &curbuf->b_s)
+ curwin->w_s = &aco->new_curbuf->b_s;
+ # endif
--curbuf->b_nwindows;
curbuf = aco->new_curbuf;
curwin->w_buffer = curbuf;
*** ../vim-7.3.510/src/version.c 2012-04-30 11:34:20.000000000 +0200
--- src/version.c 2012-04-30 17:01:05.000000000 +0200
***************
*** 716,717 ****
--- 716,719 ----
{ /* Add new patch number below this line */
+ /**/
+ 511,
/**/
--
There is no right or wrong, there is only your personal opinion.
(Bram Moolenaar)
/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\ an exciting new programming language -- http://www.Zimbu.org ///
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///

70
7.3.512 Normal file
View File

@ -0,0 +1,70 @@
To: vim_dev@googlegroups.com
Subject: Patch 7.3.512
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------
Patch 7.3.512
Problem: undofile() returns a useless name when passed an empty string.
Solution: Return an empty string. (Christian Brabandt)
Files: src/eval.c
*** ../vim-7.3.511/src/eval.c 2012-04-25 18:24:24.000000000 +0200
--- src/eval.c 2012-04-30 17:23:26.000000000 +0200
***************
*** 18259,18269 ****
rettv->v_type = VAR_STRING;
#ifdef FEAT_PERSISTENT_UNDO
{
! char_u *ffname = FullName_save(get_tv_string(&argvars[0]), FALSE);
! if (ffname != NULL)
! rettv->vval.v_string = u_get_undo_file_name(ffname, FALSE);
! vim_free(ffname);
}
#else
rettv->vval.v_string = NULL;
--- 18259,18279 ----
rettv->v_type = VAR_STRING;
#ifdef FEAT_PERSISTENT_UNDO
{
! char_u *fname = get_tv_string(&argvars[0]);
! if (*fname == NUL)
! {
! /* If there is no file name there will be no undo file. */
! rettv->vval.v_string = NULL;
! }
! else
! {
! char_u *ffname = FullName_save(fname, FALSE);
!
! if (ffname != NULL)
! rettv->vval.v_string = u_get_undo_file_name(ffname, FALSE);
! vim_free(ffname);
! }
}
#else
rettv->vval.v_string = NULL;
*** ../vim-7.3.511/src/version.c 2012-04-30 17:04:47.000000000 +0200
--- src/version.c 2012-04-30 17:24:42.000000000 +0200
***************
*** 716,717 ****
--- 716,719 ----
{ /* Add new patch number below this line */
+ /**/
+ 512,
/**/
--
It is illegal for a driver to be blindfolded while operating a vehicle.
[real standing law in Alabama, United States of America]
/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\ an exciting new programming language -- http://www.Zimbu.org ///
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///

129
7.3.513 Normal file
View File

@ -0,0 +1,129 @@
To: vim_dev@googlegroups.com
Subject: Patch 7.3.513
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------
Patch 7.3.513
Problem: Cannot use CTRL-E and CTRL-Y with "r".
Solution: Make CTRL-E and CTRL-Y work like in Insert mode. (Christian
Brabandt)
Files: src/edit.c, src/normal.c, src/proto/edit.pro
*** ../vim-7.3.512/src/edit.c 2012-04-05 16:07:01.000000000 +0200
--- src/edit.c 2012-04-30 17:53:47.000000000 +0200
***************
*** 253,259 ****
#ifdef FEAT_DIGRAPHS
static int ins_digraph __ARGS((void));
#endif
- static int ins_copychar __ARGS((linenr_T lnum));
static int ins_ctrl_ey __ARGS((int tc));
#ifdef FEAT_SMARTINDENT
static void ins_try_si __ARGS((int c));
--- 253,258 ----
***************
*** 9899,9905 ****
* Handle CTRL-E and CTRL-Y in Insert mode: copy char from other line.
* Returns the char to be inserted, or NUL if none found.
*/
! static int
ins_copychar(lnum)
linenr_T lnum;
{
--- 9898,9904 ----
* Handle CTRL-E and CTRL-Y in Insert mode: copy char from other line.
* Returns the char to be inserted, or NUL if none found.
*/
! int
ins_copychar(lnum)
linenr_T lnum;
{
*** ../vim-7.3.512/src/normal.c 2012-03-28 12:59:53.000000000 +0200
--- src/normal.c 2012-04-30 18:06:13.000000000 +0200
***************
*** 7070,7076 ****
for (n = cap->count1; n > 0; --n)
{
State = REPLACE;
! ins_char(cap->nchar);
State = old_State;
if (cap->ncharC1 != 0)
ins_char(cap->ncharC1);
--- 7070,7087 ----
for (n = cap->count1; n > 0; --n)
{
State = REPLACE;
! if (cap->nchar == Ctrl_E || cap->nchar == Ctrl_Y)
! {
! int c = ins_copychar(curwin->w_cursor.lnum
! + (cap->nchar == Ctrl_Y ? -1 : 1));
! if (c != NUL)
! ins_char(c);
! else
! /* will be decremented further down */
! ++curwin->w_cursor.col;
! }
! else
! ins_char(cap->nchar);
State = old_State;
if (cap->ncharC1 != 0)
ins_char(cap->ncharC1);
***************
*** 7092,7098 ****
* line will be changed.
*/
ptr = ml_get_buf(curbuf, curwin->w_cursor.lnum, TRUE);
! ptr[curwin->w_cursor.col] = cap->nchar;
if (p_sm && msg_silent == 0)
showmatch(cap->nchar);
++curwin->w_cursor.col;
--- 7103,7117 ----
* line will be changed.
*/
ptr = ml_get_buf(curbuf, curwin->w_cursor.lnum, TRUE);
! if (cap->nchar == Ctrl_E || cap->nchar == Ctrl_Y)
! {
! int c = ins_copychar(curwin->w_cursor.lnum
! + (cap->nchar == Ctrl_Y ? -1 : 1));
! if (c != NUL)
! ptr[curwin->w_cursor.col] = c;
! }
! else
! ptr[curwin->w_cursor.col] = cap->nchar;
if (p_sm && msg_silent == 0)
showmatch(cap->nchar);
++curwin->w_cursor.col;
*** ../vim-7.3.512/src/proto/edit.pro 2010-08-15 21:57:28.000000000 +0200
--- src/proto/edit.pro 2012-04-30 17:54:41.000000000 +0200
***************
*** 39,42 ****
--- 39,43 ----
int hkmap __ARGS((int c));
void ins_scroll __ARGS((void));
void ins_horscroll __ARGS((void));
+ int ins_copychar __ARGS((linenr_T lnum));
/* vim: set ft=c : */
*** ../vim-7.3.512/src/version.c 2012-04-30 17:35:44.000000000 +0200
--- src/version.c 2012-04-30 18:17:52.000000000 +0200
***************
*** 716,717 ****
--- 716,719 ----
{ /* Add new patch number below this line */
+ /**/
+ 513,
/**/
--
It is illegal for anyone to try and stop a child from playfully jumping over
puddles of water.
[real standing law in California, United States of America]
/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\ an exciting new programming language -- http://www.Zimbu.org ///
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///

232
7.3.514 Normal file
View File

@ -0,0 +1,232 @@
To: vim_dev@googlegroups.com
Subject: Patch 7.3.514
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------
Patch 7.3.514
Problem: No completion for :history command.
Solution: Add the completion and update the docs. Also fix ":behave"
completion. (Dominique Pelle)
Files: runtime/doc/cmdline.txt, runtime/doc/map.txt, src/ex_docmd.c,
src/ex_getln.c, src/vim.h
*** ../vim-7.3.513/runtime/doc/cmdline.txt 2010-08-15 21:57:17.000000000 +0200
--- runtime/doc/cmdline.txt 2012-04-30 18:30:00.000000000 +0200
***************
*** 330,341 ****
:his[tory] [{name}] [{first}][, [{last}]]
List the contents of history {name} which can be:
! c[md] or : command-line history
! s[earch] or / search string history
! e[xpr] or = expression register history
! i[nput] or @ input line history
! d[ebug] or > debug command history
! a[ll] all of the above
{not in Vi}
If the numbers {first} and/or {last} are given, the respective
--- 330,341 ----
:his[tory] [{name}] [{first}][, [{last}]]
List the contents of history {name} which can be:
! c[md] or : command-line history
! s[earch] or / or ? search string history
! e[xpr] or = expression register history
! i[nput] or @ input line history
! d[ebug] or > debug command history
! a[ll] all of the above
{not in Vi}
If the numbers {first} and/or {last} are given, the respective
*** ../vim-7.3.513/runtime/doc/map.txt 2011-07-20 16:36:35.000000000 +0200
--- runtime/doc/map.txt 2012-04-30 18:30:00.000000000 +0200
***************
*** 1202,1207 ****
--- 1219,1225 ----
-complete=augroup autocmd groups
-complete=buffer buffer names
+ -complete=behave :behave suboptions
-complete=color color schemes
-complete=command Ex command (and arguments)
-complete=compiler compilers
***************
*** 1216,1221 ****
--- 1234,1240 ----
-complete=function function name
-complete=help help subjects
-complete=highlight highlight groups
+ -complete=history :history suboptions
-complete=locale locale names (as output of locale -a)
-complete=mapping mapping name
-complete=menu menus
*** ../vim-7.3.513/src/ex_docmd.c 2012-02-12 20:13:55.000000000 +0100
--- src/ex_docmd.c 2012-04-30 18:33:27.000000000 +0200
***************
*** 3920,3927 ****
--- 3920,3935 ----
#endif
case CMD_behave:
xp->xp_context = EXPAND_BEHAVE;
+ xp->xp_pattern = arg;
break;
+ #if defined(FEAT_CMDHIST)
+ case CMD_history:
+ xp->xp_context = EXPAND_HISTORY;
+ xp->xp_pattern = arg;
+ break;
+ #endif
+
#endif /* FEAT_CMDL_COMPL */
default:
***************
*** 5329,5334 ****
--- 5337,5343 ----
} command_complete[] =
{
{EXPAND_AUGROUP, "augroup"},
+ {EXPAND_BEHAVE, "behave"},
{EXPAND_BUFFERS, "buffer"},
{EXPAND_COLORS, "color"},
{EXPAND_COMMANDS, "command"},
***************
*** 5350,5357 ****
{EXPAND_FUNCTIONS, "function"},
{EXPAND_HELP, "help"},
{EXPAND_HIGHLIGHT, "highlight"},
#if (defined(HAVE_LOCALE_H) || defined(X_LOCALE)) \
! && (defined(FEAT_GETTEXT) || defined(FEAT_MBYTE))
{EXPAND_LOCALES, "locale"},
#endif
{EXPAND_MAPPINGS, "mapping"},
--- 5359,5369 ----
{EXPAND_FUNCTIONS, "function"},
{EXPAND_HELP, "help"},
{EXPAND_HIGHLIGHT, "highlight"},
+ #if defined(FEAT_CMDHIST)
+ {EXPAND_HISTORY, "history"},
+ #endif
#if (defined(HAVE_LOCALE_H) || defined(X_LOCALE)) \
! && (defined(FEAT_GETTEXT) || defined(FEAT_MBYTE))
{EXPAND_LOCALES, "locale"},
#endif
{EXPAND_MAPPINGS, "mapping"},
*** ../vim-7.3.513/src/ex_getln.c 2012-03-07 19:16:49.000000000 +0100
--- src/ex_getln.c 2012-04-30 18:36:04.000000000 +0200
***************
*** 25,31 ****
int cmdlen; /* number of chars in command line */
int cmdpos; /* current cursor position */
int cmdspos; /* cursor column on screen */
! int cmdfirstc; /* ':', '/', '?', '=' or NUL */
int cmdindent; /* number of spaces before cmdline */
char_u *cmdprompt; /* message in front of cmdline */
int cmdattr; /* attributes for prompt */
--- 25,31 ----
int cmdlen; /* number of chars in command line */
int cmdpos; /* current cursor position */
int cmdspos; /* cursor column on screen */
! int cmdfirstc; /* ':', '/', '?', '=', '>' or NUL */
int cmdindent; /* number of spaces before cmdline */
char_u *cmdprompt; /* message in front of cmdline */
int cmdattr; /* attributes for prompt */
***************
*** 111,116 ****
--- 111,119 ----
#ifdef FEAT_CMDL_COMPL
static int expand_shellcmd __ARGS((char_u *filepat, int *num_file, char_u ***file, int flagsarg));
static int ExpandRTDir __ARGS((char_u *pat, int *num_file, char_u ***file, char *dirname[]));
+ # ifdef FEAT_CMDHIST
+ static char_u *get_history_arg __ARGS((expand_T *xp, int idx));
+ # endif
# if defined(FEAT_USR_CMDS) && defined(FEAT_EVAL)
static int ExpandUserDefined __ARGS((expand_T *xp, regmatch_T *regmatch, int *num_file, char_u ***file));
static int ExpandUserList __ARGS((expand_T *xp, int *num_file, char_u ***file));
***************
*** 4628,4633 ****
--- 4631,4639 ----
{
{EXPAND_COMMANDS, get_command_name, FALSE, TRUE},
{EXPAND_BEHAVE, get_behave_arg, TRUE, TRUE},
+ #ifdef FEAT_CMDHIST
+ {EXPAND_HISTORY, get_history_arg, TRUE, TRUE},
+ #endif
#ifdef FEAT_USR_CMDS
{EXPAND_USER_COMMANDS, get_user_commands, FALSE, TRUE},
{EXPAND_USER_CMD_FLAGS, get_user_cmd_flags, FALSE, TRUE},
***************
*** 5245,5250 ****
--- 5251,5284 ----
NULL
};
+ #if defined(FEAT_CMDL_COMPL) || defined(PROTO)
+ /*
+ * Function given to ExpandGeneric() to obtain the possible first
+ * arguments of the ":history command.
+ */
+ static char_u *
+ get_history_arg(xp, idx)
+ expand_T *xp UNUSED;
+ int idx;
+ {
+ static char_u compl[2] = { NUL, NUL };
+ char *short_names = ":=@>?/";
+ int short_names_count = STRLEN(short_names);
+ int history_name_count = sizeof(history_names) / sizeof(char *) - 1;
+
+ if (idx < short_names_count)
+ {
+ compl[0] = (char_u)short_names[idx];
+ return compl;
+ }
+ if (idx < short_names_count + history_name_count)
+ return (char_u *)history_names[idx - short_names_count];
+ if (idx == short_names_count + history_name_count)
+ return (char_u *)"all";
+ return NULL;
+ }
+ #endif
+
/*
* init_history() - Initialize the command line history.
* Also used to re-allocate the history when the size changes.
*** ../vim-7.3.513/src/vim.h 2012-03-23 16:25:13.000000000 +0100
--- src/vim.h 2012-04-30 18:30:00.000000000 +0200
***************
*** 781,786 ****
--- 781,787 ----
#define EXPAND_FILES_IN_PATH 38
#define EXPAND_OWNSYNTAX 39
#define EXPAND_LOCALES 40
+ #define EXPAND_HISTORY 41
/* Values for exmode_active (0 is no exmode) */
#define EXMODE_NORMAL 1
*** ../vim-7.3.513/src/version.c 2012-04-30 18:18:43.000000000 +0200
--- src/version.c 2012-04-30 18:36:19.000000000 +0200
***************
*** 716,717 ****
--- 716,719 ----
{ /* Add new patch number below this line */
+ /**/
+ 514,
/**/
--
You can be stopped by the police for biking over 65 miles per hour.
You are not allowed to walk across a street on your hands.
[real standing laws in Connecticut, United States of America]
/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\ an exciting new programming language -- http://www.Zimbu.org ///
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///

68
7.3.515 Normal file
View File

@ -0,0 +1,68 @@
To: vim_dev@googlegroups.com
Subject: Patch 7.3.515
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------
Patch 7.3.515
Problem: 'wildignorecase' only applies to the last part of the path.
Solution: Also ignore case for letters earlier in the path.
Files: src/misc1.c
*** ../vim-7.3.514/src/misc1.c 2012-04-09 20:42:20.000000000 +0200
--- src/misc1.c 2012-04-30 21:00:18.000000000 +0200
***************
*** 9461,9466 ****
--- 9461,9467 ----
/*
* Find the first part in the path name that contains a wildcard.
+ * When EW_ICASE is set every letter is considered to be a wildcard.
* Copy it into "buf", including the preceding characters.
*/
p = buf;
***************
*** 9480,9486 ****
s = p + 1;
}
else if (path_end >= path + wildoff
! && vim_strchr((char_u *)"*?[{~$", *path_end) != NULL)
e = p;
#ifdef FEAT_MBYTE
if (has_mbyte)
--- 9481,9492 ----
s = p + 1;
}
else if (path_end >= path + wildoff
! && (vim_strchr((char_u *)"*?[{~$", *path_end) != NULL
! #ifndef CASE_INSENSITIVE_FILENAME
! || ((flags & EW_ICASE)
! && isalpha(PTR2CHAR(path_end)))
! #endif
! ))
e = p;
#ifdef FEAT_MBYTE
if (has_mbyte)
*** ../vim-7.3.514/src/version.c 2012-04-30 18:48:38.000000000 +0200
--- src/version.c 2012-04-30 21:05:10.000000000 +0200
***************
*** 716,717 ****
--- 716,719 ----
{ /* Add new patch number below this line */
+ /**/
+ 515,
/**/
--
If an elephant is left tied to a parking meter, the parking fee has to be paid
just as it would for a vehicle.
[real standing law in Florida, United States of America]
/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\ an exciting new programming language -- http://www.Zimbu.org ///
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///

494
Changelog.rpm
View File

@ -1,415 +1,209 @@
* Fri Jul 04 2008 Karsten Hopp <karsten@redhat.com> 7.1.330-2 * Tue Jul 27 2010 Mamoru Tasaka <mtasaka@ioa.s.u-tokyo.ac.jp> 7.2.446-2
- new rpm doesn't like zero filled, 3 digit patch numbers - Rebuild against python 2.7
* Fri Jul 04 2008 Karsten Hopp <karsten@redhat.com> 7.1.330-1 * Tue Jul 13 2010 Karsten Hopp <karsten@redhat.com> 7.2.446-1
- patchlevel 330 - patchlevel 446
* Wed Jun 04 2008 Karsten Hopp <karsten@redhat.com> 7.1.309-1 * Thu Jul 08 2010 Karsten Hopp <karsten@redhat.com> 7.2.445-1
- Patchlevel 309 - patchlevel 445
* Wed Jun 04 2008 Karsten Hopp <karsten@redhat.com> 7.1.306-1 * Wed Jun 23 2010 Karsten Hopp <karsten@redhat.com> 7.2.444-2
- patchlevel 306, fixes some unicode characters - rebuild with perl-5.12
* Tue Jun 03 2008 Karsten Hopp <karsten@redhat.com> 7.1.305-1 * Sun Jun 13 2010 Karsten Hopp <karsten@redhat.com> 7.2.444-1
- patchlevel 305 - patchlevel 444
- put /etc/vimrc autocmd's into fedora augroup (similar to #241308)
* Thu May 15 2008 Karsten Hopp <karsten@redhat.com> 7.1.298-1 * Sun Jun 13 2010 Karsten Hopp <karsten@redhat.com> 7.2.443-1
- patchlevel 298 - patchlevel 443
* Fri Apr 11 2008 Karsten Hopp <karsten@redhat.com> 7.1.293-1 * Sat Jun 05 2010 Karsten Hopp <karsten@redhat.com> 7.2.442-1
- patchlevel 293 - patchlevel 442
- update forth syntax file (Benjamin Krill)
* Wed Apr 02 2008 Karsten Hopp <karsten@redhat.com> 7.1.291-1 * Wed Jun 02 2010 Marcela Maslanova <mmaslano@redhat.com> - 2:7.2.441-2
- patchlevel 291, more fixes for leftover /tmp/cscope* files - Mass rebuild with perl-5.12.0
* Tue Mar 18 2008 Tom "spot" Callaway <tcallawa@redhat.com> 7.1.283-2 * Sun May 30 2010 Karsten Hopp <karsten@redhat.com> 7.2.441-1
- add Requires for versioned perl (libperl.so) - patchlevel 441
* Mon Mar 17 2008 Karsten Hopp <karsten@redhat.com> 7.1.283-1 * Sat May 29 2010 Karsten Hopp <karsten@redhat.com> 7.2.440-1
- patchlevel 283, fixes leftover cscope files in /tmp - patchlevel 440
* Wed Mar 12 2008 Karsten Hopp <karsten@redhat.com> 7.1.273-1 * Wed May 26 2010 Karsten Hopp <karsten@redhat.com> 7.2.438-1
- update to patchlevel 273, this fixes #436902 - patchlevel 438
* Tue Mar 11 2008 Karsten Hopp <karsten@redhat.com> 7.1.270-1 * Sat May 22 2010 Karsten Hopp <karsten@redhat.com> 7.2.437-1
- patchlevel 270 - patchlevel 437
- don't write swapfile on most common locations for USB-sticks (#436752)
- add spec file template
* Mon Mar 10 2008 Tom "spot" Callaway <tcallawa@redhat.com> 7.1.269-2 * Sun May 16 2010 Karsten Hopp <karsten@redhat.com> 7.2.436-1
- BR: ExtUtils::Embed to find perl headers - patchlevel 436
* Mon Mar 10 2008 Karsten Hopp <karsten@redhat.com> 7.1.269-1 * Sat May 15 2010 Karsten Hopp <karsten@redhat.com> 7.2.433-1
- patchlevel 269 - patchlevel 433
- rebuild with new perl (#436731)
* Mon Mar 03 2008 Karsten Hopp <karsten@redhat.com> 7.1.266-1 * Fri May 14 2010 Karsten Hopp <karsten@redhat.com> 7.2.427-1
- patchlevel 266 - patchlevel 427
- add minimal help page for /bin/vi (#173974)
* Mon Feb 25 2008 Karsten Hopp <karsten@redhat.com> 7.1.262-1 * Thu May 13 2010 Karsten Hopp <karsten@redhat.com> 7.2.422-1
- patchlevel 262 - patchlevel 422
- add fix for #231124, BOM was ignored
- enable ruby interpreter (#215207)
- add filetype for Erlang header files (#417371)
* Mon Feb 11 2008 Karsten Hopp <karsten@redhat.com> 7.1.245-1 * Fri May 07 2010 Karsten Hopp <karsten@redhat.com> 7.2.416-1
- patchlevel 245 - patchlevel 416
* Sun Jan 27 2008 Karsten Hopp <karsten@redhat.com> 7.1.242-1 * Tue Apr 20 2010 Karsten Hopp <karsten@redhat.com> 7.2.411-2
- patchlevel 242 - fix rvim manpage (#583180)
* Fri Jan 18 2008 Karsten Hopp <karsten@redhat.com> 7.1.233-2 * Wed Mar 24 2010 Karsten Hopp <karsten@redhat.com> 7.2.411-1
- silence taglist plugin (#429200) - patchlevel 411
* Fri Jan 18 2008 Karsten Hopp <karsten@redhat.com> 7.1.233-1 * Tue Mar 23 2010 Karsten Hopp <karsten@redhat.com> 7.2.410-1
- patchlevel 233 - patchlevel 410
- fix ada patch
* Wed Jan 16 2008 Karsten Hopp <karsten@redhat.com> 7.1.230-2 * Sat Mar 20 2010 Karsten Hopp <karsten@redhat.com> 7.2.403-1
- add newer ada runtime files to fix bugzilla #246378 - patchlevel 403
* Wed Jan 16 2008 Karsten Hopp <karsten@redhat.com> 7.1.230-1 * Thu Mar 18 2010 Karsten Hopp <karsten@redhat.com> 7.2.402-1
- patchlevel 230, fixes memory leak - patchlevel 402
* Mon Jan 14 2008 Karsten Hopp <karsten@redhat.com> 7.1.228-1 * Wed Mar 17 2010 Karsten Hopp <karsten@redhat.com> 7.2.399-1
- patchlevel 228 - patchlevel 399
- allow overwriting WITH_SELING at build time (#427710)
* Thu Jan 10 2008 Karsten Hopp <karsten@redhat.com> 7.1.214-1 * Wed Mar 10 2010 Karsten Hopp <karsten@redhat.com> 7.2.394-1
- patchlevel 214 - patchlevel 394
* Mon Jan 07 2008 Karsten Hopp <karsten@redhat.com> 7.1.211-1 * Wed Mar 03 2010 Karsten Hopp <karsten@redhat.com> 7.2.385-1
- patchlevel 211 - patchlevel 385
* Sat Dec 22 2007 Karsten Hopp <karsten@redhat.com> 7.1.175-1 * Tue Mar 02 2010 Karsten Hopp <karsten@redhat.com> 7.2.384-1
- patchlevel 175 - patchlevel 384
* Thu Nov 22 2007 Karsten Hopp <karsten@redhat.com> 7.1.159-1 * Tue Mar 02 2010 Karsten Hopp <karsten@redhat.com> 7.2.381-1
- patchlevel 159 - patchlevel 381
- vim-enhanced requires which for vimtutor (#395371)
* Thu Oct 04 2007 Karsten Hopp <karsten@redhat.com> 7.1.135-1 * Sat Feb 27 2010 Karsten Hopp <karsten@redhat.com> 7.2.377-1
- patchlevel 135 - patchlevel 377
* Wed Sep 26 2007 Karsten Hopp <karsten@redhat.com> 7.1.122-1 * Wed Feb 24 2010 Karsten Hopp <karsten@redhat.com> 7.2.376-1
- patchlevel 122 - patchlevel 376
* Tue Sep 25 2007 Karsten Hopp <karsten@redhat.com> 7.1.119-1 * Thu Feb 18 2010 Karsten Hopp <karsten@redhat.com> 7.2.368-1
- patchlevel 119 - patchlevel 368
* Mon Sep 24 2007 Karsten Hopp <karsten@redhat.com> 7.1.116-1 * Thu Feb 18 2010 Karsten Hopp <karsten@redhat.com> 7.2.367-1
- patchlevel 116 - patchlevel 367
* Fri Sep 07 2007 Karsten Hopp <karsten@redhat.com> 7.1.100-1 * Wed Feb 17 2010 Karsten Hopp <karsten@redhat.com> 7.2.365-1
- patchlevel 100 - patchlevel 365
* Fri Aug 24 2007 Karsten Hopp <karsten@redhat.com> 7.1.87-1 * Fri Feb 12 2010 Karsten Hopp <karsten@redhat.com> 7.2.359-1
- add build requirement perl-devel - patchlevel 359
- fix tarball unpacking
- patchlevel 87
* Wed Aug 15 2007 Karsten Hopp <karsten@redhat.com> 7.1.77-1 * Thu Feb 11 2010 Karsten Hopp <karsten@redhat.com> 7.2.357-1
- patchlevel 77 - patchlevel 357
* Mon Aug 13 2007 Karsten Hopp <karsten@redhat.com> 7.1.68-1 * Thu Feb 04 2010 Karsten Hopp <karsten@redhat.com> 7.2.356-1
- patchlevel 68 - patchlevel 356
* Thu Aug 02 2007 Karsten Hopp <karsten@redhat.com> 7.1.47-1 * Wed Feb 03 2010 Karsten Hopp <karsten@redhat.com> 7.2.354-1
- patchlevel 47 - patchlevel 354
* Wed Jul 11 2007 Karsten Hopp <karsten@redhat.com> 7.1.28-1 * Fri Jan 29 2010 Karsten Hopp <karsten@redhat.com> 7.2.351-1
- patchlevel 28 - patchlevel 351
* Wed Jun 27 2007 Karsten Hopp <karsten@redhat.com> 7.1.12-1 * Thu Jan 28 2010 Karsten Hopp <karsten@redhat.com> 7.2.350-1
- Patchlevel 12 - patchlevel 350
* Mon Jun 04 2007 Karsten Hopp <karsten@redhat.com> 7.1.2-1 * Mon Dec 7 2009 Stepan Kasal <skasal@redhat.com> - 2:7.2.315-2
- vim 7.1 - rebuild against perl 5.10.1
- drop 240 patches
* Tue May 22 2007 Karsten Hopp <karsten@redhat.com> 7.0.235-1 * Wed Dec 03 2009 Karsten Hopp <karsten@redhat.com> 7.2.315-1
- Don't wake up system with blinking gvim cursor: - patchlevel 315
http://www.linuxpowertop.org/known.php - fix vimrc location in man page (#456992)
- correct syntax highlighting of httpd config files in /etc/httpd (#499123)
- Buildrequire ruby, ruby-devel (#503872)
- Remove check for static gravity (#510307)
- sort tags file (#517725)
- use one gvim to open multiple file selections from nautilus (#519265)
- use elinks -source instead of elinks -dump (#518791)
- add ext4 keyword to /etc/fstab syntax highlighting (#498290)
* Mon Apr 30 2007 Karsten Hopp <karsten@redhat.com> 7.0.235-1 * Mon Nov 09 2009 Karsten Hopp <karsten@redhat.com> 7.2.284-1
- update to patchlevel 235, fixes modeline issues - patchlevel 284
* Tue Apr 17 2007 Karsten Hopp <karsten@redhat.com> 7.0.224-3 * Thu Aug 20 2009 Karsten Hopp <karsten@redhat.com> 7.2.245-3
- fix typo in require line (vim-X11 - 2:7.0.224-2.fc7.i386 requires 4) - change range of system ids in /etc/profile.d/vim/* (#518555)
* Mon Apr 16 2007 Karsten Hopp <karsten@redhat.com> 7.0.224-2 * Mon Aug 03 2009 Karsten Hopp <karsten@redhat.com> 7.2.245-2
- use more macros - add fix for glibc fortify segfault (#514717, Adam Tkac)
- drop BR perl
- move license to main doc directory
- set vendor to 'fedora' (desktop-file)
- don't own man directories
- preserve timestamps of non-generated files
- run update-desktop-database
* Thu Apr 05 2007 Karsten Hopp <karsten@redhat.com> 7.0.224-1 * Sat Aug 01 2009 Karsten Hopp <karsten@redhat.com> 7.2.245-1
- vim-X11 provides gvim - add 97 upstream patches to get to patchlevel 245
* Fri Mar 30 2007 Karsten Hopp <karsten@redhat.com> 7.0.224-1 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2:7.2.148-2
- patchlevel 224 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
* Wed Feb 21 2007 Karsten Hopp <karsten@redhat.com> 7.0.195-2 * Fri Mar 27 2009 Karsten Hopp <karsten@redhat.com> 7.2.148-1
- rpmlint fixes (#226526) - patchlevel 148, fixes #461417
* Tue Feb 13 2007 Karsten Hopp <karsten@redhat.com> 7.0.195-1 * Tue Mar 10 2009 Karsten Hopp <karsten@redhat.com> 7.2.132-1
- patchlevel 195 - patchlevel 132, fixes accesses to freed memory
* Mon Feb 12 2007 Karsten Hopp <karsten@redhat.com> 7.0.192-1 * Wed Mar 04 2009 Karsten Hopp <karsten@redhat.com> 7.2.131-1
- patchlevel 192 - patchlevel 131
- test fix for highlighting problems with curly brackets in #define (#203577)
* Tue Feb 06 2007 Karsten Hopp <karsten@redhat.com> 7.0.191-2 * Tue Feb 24 2009 Karsten Hopp <karsten@redhat.com> 7.2.127-1
- uses ncurses instead of ncursesw - patchlevel 127
* Tue Feb 06 2007 Karsten Hopp <karsten@redhat.com> 7.0.191-1 * Mon Feb 23 2009 Karsten Hopp <karsten@redhat.com> 7.2.124-1
- patchlevel 191 - patchlevel 124
- clean up spec file for rpmlint
- drop cvim stuff
* Tue Jan 23 2007 Karsten Hopp <karsten@redhat.com> 7.0.188-3 * Mon Jan 26 2009 Karsten Hopp <karsten@redhat.com> 7.2.088-1
- patchlevel 188 - patchlevel 88
* Mon Jan 08 2007 Karsten Hopp <karsten@redhat.com> 7.0.178-3 * Thu Jan 08 2009 Karsten Hopp <karsten@redhat.com> 7.2.079-2
- enable filetype plugin - patchlevel 79
* Thu Dec 14 2006 Karsten Hopp <karsten@redhat.com> 7.0.178-2 * Thu Dec 04 2008 Jesse Keating <jkeating@redhat.com> - 7.2.060-2
- build vim-minimal with features=small instead of tiny (#219605) - Rebuild for new python.
* Tue Dec 12 2006 Karsten Hopp <karsten@redhat.com> 7.0.178-1 * Mon Dec 01 2008 Karsten Hopp <karsten@redhat.com> 7.2.060-1
- add vimfiles/after to list of owned directories - patchlevel 60
* Tue Dec 12 2006 Karsten Hopp <karsten@redhat.com> 7.0.178-1 * Mon Nov 10 2008 Karsten Hopp <karsten@redhat.com> 7.2.032-1
- patchlevel 178 - patchlevel 32
- use macros
- Resolves: #219154
add directory /usr/share/vim/vimfiles for plugins
* Thu Dec 7 2006 Jeremy Katz <katzj@redhat.com> * Mon Nov 03 2008 Karsten Hopp <karsten@redhat.com> 7.2.026-2
- rebuild for python 2.5 - add more /usr/share/vim/vimfiles directories (#444387)
* Wed Nov 22 2006 Karsten Hopp <karsten@redhat.com> 7.0.168-1 * Mon Nov 03 2008 Karsten Hopp <karsten@redhat.com> 7.2.026-1
- patchlevel 168 - patchlevel 26
- link with ncurses - own some directories in /usr/share/vim/vimfiles (#469491)
* Tue Nov 21 2006 Karsten Hopp <karsten@redhat.com> 7.0.164-2 * Tue Oct 21 2008 Karsten Hopp <karsten@redhat.com> 7.2.025-2
- patchlevel 164 - re-enable clean
* Mon Nov 13 2006 Karsten Hopp <karsten@redhat.com> 7.0.162-2 * Mon Oct 20 2008 Karsten Hopp <karsten@redhat.com> 7.2.025-1
- fix lang problem in spec file mode - patchlevel 25
- use old g:packager variable when set - add Categories tag to desktop file (#226526)
- add requirement on hicolor-icon-theme to vim-X11 (#226526)
- drop Amiga info files (#226526)
- remove non-utf8 man pages (#226526)
- drop Application from categories (#226526)
* Fri Nov 10 2006 Karsten Hopp <karsten@redhat.com> 7.0.162-1 * Tue Sep 30 2008 Karsten Hopp <karsten@redhat.com> 7.2.022-1
- patchlevel 162
* Mon Nov 06 2006 Karsten Hopp <karsten@redhat.com> 7.0.158-1
- patchlevel 158
* Tue Oct 17 2006 Karsten Hopp <karsten@redhat.com> 7.0.139-1
- patchlevel 139
- provide vim, vi (#210950)
* Thu Sep 28 2006 Jeremy Katz <katzj@redhat.com> - 7.0.109-3
- disable vim-spell subpackage as it pushes us over CD boundaries
* Tue Sep 28 2006 Karsten Hopp <karsten@redhat.com> 7.0.109-2
- fix typo in vimspell.sh (#203178)
* Tue Sep 19 2006 Karsten Hopp <karsten@redhat.com> 7.0.109-1
- update to patchlevel 109 to fix some redraw problems
- fix invisible comments in diff mode (#204042)
* Tue Sep 12 2006 Karsten Hopp <karsten@redhat.com> 7.0.100-1
- Patchlevel 100
- replace runtime files with newer ones
* Mon Sep 11 2006 Karsten Hopp <karsten@redhat.de> 7.0.099-1
- Patchlevel 99
* Mon Sep 05 2006 Karsten Hopp <karsten@redhat.de> 7.0.086-1
- Patchlevel 86
* Mon Sep 04 2006 Karsten Hopp <karsten@redhat.de> 7.0.083-1
- Patchlevel 83
* Wed Aug 30 2006 Karsten Hopp <karsten@redhat.de> 7.0.076-1
- Patchlevel 76
* Thu Aug 25 2006 Karsten Hopp <karsten@redhat.de> 7.0.066-2
- fix vimdiff colors (#204042)
* Thu Aug 24 2006 Karsten Hopp <karsten@redhat.de> 7.0.066-1
- fix syntax patch (#203798)
- patchlevel 66
* Wed Aug 17 2006 Karsten Hopp <karsten@redhat.de> 7.0.063-1
- Patchlevel 63
* Wed Aug 15 2006 Karsten Hopp <karsten@redhat.de> 7.0.053-1
- Patchlevel 53
- Buildrequires libXpm-devel
* Wed Aug 09 2006 Karsten Hopp <karsten@redhat.de> 7.0.050-1
- Patchlevel 50
* Thu Aug 03 2006 Karsten Hopp <karsten@redhat.de> 7.0.042-2
- clean up spec file
* Mon Jul 24 2006 Karsten Hopp <karsten@redhat.de> 7.0.042-1
- patchlevel 42
* Wed Jul 20 2006 Karsten Hopp <karsten@redhat.de> 7.0.039-1
- patchlevel 39
- allow usage of $VIM variable (#199465)
* Wed Jul 12 2006 Jesse Keating <jkeating@redhat.com> - 2:7.0.035-1.1
- rebuild
* Tue Jun 27 2006 Karsten Hopp <karsten@redhat.de> 7.0.035-1
- patchlevel 35
* Wed Jun 21 2006 Karsten Hopp <karsten@redhat.de> 7.0.022-2
- add binfmt_misc rpc_pipefs to fstypes for better mtab highlighting
* Tue Jun 20 2006 Karsten Hopp <karsten@redhat.de> 7.0.022-1
- patchlevel 22 - patchlevel 22
* Tue Jun 20 2006 Karsten Hopp <karsten@redhat.de> 7.0.020-1 * Mon Sep 08 2008 Karsten Hopp <karsten@redhat.com> 7.2.013-1
- patchlevel 20 - patchlevel 13
* Tue Jun 20 2006 Karsten Hopp <karsten@redhat.de> 7.0.019-1 * Mon Aug 25 2008 Karsten Hopp <karsten@redhat.com> 7.2.006-1
- patchlevel 19 - patchlevel 6
- buildrequire autoconf
* Tue May 30 2006 Karsten Hopp <karsten@redhat.de> 7.0.017-1 * Mon Aug 18 2008 Karsten Hopp <karsten@redhat.com> 7.2.002-1
- patchlevel 17, although it affects just the Motif version - patchlevel 2
- own some directories (#192787) - fix specfile template (#446070)
- old specfile changelog moved to Changelog.rpm
* Sat May 13 2006 Karsten Hopp <karsten@redhat.de> 7.0.016-1 * Fri Aug 14 2008 Karsten Hopp <karsten@redhat.com> 7.2.000-1
- patchlevel 016 - vim 7.2
- drop 330 patches
* Fri May 12 2006 Karsten Hopp <karsten@redhat.de> 7.0.012-1
- patchlevel 012
* Thu May 11 2006 Karsten Hopp <karsten@redhat.de> 7.0.010-1
- patchlevel 010
* Wed May 10 2006 Karsten Hopp <karsten@redhat.de> 7.0.005-2
- patchlevel 005
- move older changelogs (<7.0) into a file, no need to keep them
in the rpm database
* Tue May 09 2006 Karsten Hopp <karsten@redhat.de> 7.0.000-2
- bump epoch, the buildsystem thinks 7.0.000-2 is older than 7.0.g001-1
although rpm is quite happy with it.
* Mon May 08 2006 Karsten Hopp <karsten@redhat.de> 7.0.000-1
- vim-7.0
- Spell checking support for about 50 languages
- Intelligent completion for C, HTML, Ruby, Python, PHP, etc.
- Tab pages, each containing multiple windows
- Undo branches: never accidentally lose text again
- Vim script supports Lists and Dictionaries (similar to Python)
- Vim script profiling
- Improved Unicode support
- Highlighting of cursor line, cursor column and matching braces
- Translated manual pages support.
- Internal grep; works on all platforms, searches compressed files
- Browsing remote directories, zip and tar archives
- Printing multi-byte text
- find details about the changes since vim-6.4 with :help version7
- fix SE Linux context of temporary (.swp) files (#189968)
- /bin/vi /vim-minimal is now using /etc/virc to avoid .rpmnew files
when updating
* Tue May 02 2006 Karsten Hopp <karsten@redhat.de> 7.0.g001-1
- vim-7.0g BETA
* Fri Apr 28 2006 Karsten Hopp <karsten@redhat.de> 7.0.f001-1
- vim-7.0f3 BETA
* Thu Apr 20 2006 Karsten Hopp <karsten@redhat.de> 7.0.e001-1
- vim-7.0e BETA
* Tue Apr 11 2006 Karsten Hopp <karsten@redhat.de> 7.0.d001-1
- vim-7.0d BETA
* Fri Apr 07 2006 Karsten Hopp <karsten@redhat.de> 7.0c.000-3
- fix vimrc filename
* Thu Apr 06 2006 Karsten Hopp <karsten@redhat.de> 7.0c.000-2
- new snapshot
* Tue Apr 04 2006 Karsten Hopp <karsten@redhat.de> 7.0c.000-1
- vim-7.0c BETA
* Wed Mar 22 2006 Karsten Hopp <karsten@redhat.de> 7.0aa.000-3
- Rawhide build as vim, opposed to vim7 (prerelease)
- conflict with older man-pages-{it,fr} packages
- cleanup lang stuff
* Thu Mar 16 2006 Karsten Hopp <karsten@redhat.de> 7.0aa.000-2
- make it coexist with vim-6 (temporarily)
- new CVS snapshot
* Tue Mar 14 2006 Karsten Hopp <karsten@redhat.de> 7.0aa.000-1
- vim7 pre Release
- older changelogs available in Changelog.rpm
* Thu Mar 09 2006 Karsten Hopp <karsten@redhat.de> 6.4.007-4
- fix configure check for python (#184478)
* Thu Mar 09 2006 Karsten Hopp <karsten@redhat.de> 6.4.007-3
- rebuild
* Mon Feb 20 2006 Karsten Hopp <karsten@redhat.de> 6.4.007-2
- gtk-update-icon-cache --ignore-theme-index
(avoids %%post failures when hicolor-icon-theme isn't installed)
* Wed Feb 15 2006 Karsten Hopp <karsten@redhat.de> 6.4.007-1
- fix vim.csh script (#180429)
- patchlevel 7
* Fri Feb 10 2006 Jesse Keating <jkeating@redhat.com> - 1:6.4.006-1.2
- bump again for double-long bug on ppc(64)
* Tue Feb 07 2006 Jesse Keating <jkeating@redhat.com> - 1:6.4.006-1.1
- rebuilt for new gcc4.1 snapshot and glibc changes
* Mon Jan 02 2006 Karsten Hopp <karsten@redhat.de> 6.4.006-1
- patchlevel 6, fixes bz# 175048
* Tue Dec 20 2005 Karsten Hopp <karsten@redhat.de> 6.4.004-2
- disable templates when editing new .c / .h files (#175878)
* Fri Dec 09 2005 Jesse Keating <jkeating@redhat.com>
- rebuilt
* Thu Dec 08 2005 Karsten Hopp <karsten@redhat.de> 6.4.004-1
- fix fstab syntax file (#174735)
- patchlevel 4
* Wed Nov 30 2005 Karsten Hopp <karsten@redhat.de> 6.4.003-1
- patchlevel 3
- remove withgui switch as we include vim-X11 in all our distributions now
(#174271)
* Fri Nov 25 2005 Karsten Hopp <karsten@redhat.de> 6.4.000-4
- enable tmpfile patch
* Thu Oct 27 2005 Karsten Hopp <karsten@redhat.de> 6.4.000-3
- test build
* Tue Oct 25 2005 Karsten Hopp <karsten@redhat.de> 6.4.000-2
- use %%{_sysconfdir} (#171556)
- add syntax highlighting rule for %%check (Ralf Ertzinger, #165277)
* Mon Oct 17 2005 Karsten Hopp <karsten@redhat.de> 6.4.000-1
- vim-6.4 patchlevel 0

46
README.patches
View File

@ -366,7 +366,7 @@ Individual patches for Vim 7.3:
7688 7.3.333 "." repeats a Visual delete by byte size instead of characters 7688 7.3.333 "." repeats a Visual delete by byte size instead of characters
1710 7.3.334 latest MingW complains about XSUBPP referencing itself 1710 7.3.334 latest MingW complains about XSUBPP referencing itself
1532 7.3.335 changing 'imdisable' in Insert mode takes effect only later 1532 7.3.335 changing 'imdisable' in Insert mode takes effect only later
30504 7.3.336 encoding in tags file causes trouble 30156 7.3.336 encoding in tags file causes trouble (NOW IN LATIN1)
1876 7.3.337 no screen update after resizing xterm until character typed 1876 7.3.337 no screen update after resizing xterm until character typed
2851 7.3.338 using getchar() in an expression mapping doesn't work well 2851 7.3.338 using getchar() in an expression mapping doesn't work well
1762 7.3.339 "make shadow" doesn't link all test files 1762 7.3.339 "make shadow" doesn't link all test files
@ -502,3 +502,47 @@ Individual patches for Vim 7.3:
1557 7.3.469 compiler warning for unused argument 1557 7.3.469 compiler warning for unused argument
1892 7.3.470 test 62 fails when compiled without GUI and X11 1892 7.3.470 test 62 fails when compiled without GUI and X11
2817 7.3.471 can't abort listing placed signs 2817 7.3.471 can't abort listing placed signs
2792 7.3.472 crash when using ":redraw" in a BufEnter autocmd
2119 7.3.473 'cursorbind' does not work correctly with 'virtualedit' "all"
1682 7.3.474 gcc 4 build with Perl fails
3670 7.3.475 in terminal with few colors omnicomplete menu is hard to see
1874 7.3.476 backspacing in a Visual block selection causes problems.
1725 7.3.477 scrolling back at the more prompt shows the wrong text
1354 7.3.478 memory leak when the ':rv!' command reads a dict or list
6622 7.3.479 'cursorline' line number highlighting can't be set separately
6208 7.3.480 when using ":qa" priority of changed buffers could be better
1945 7.3.481 changing 'virtualedit' in an operator function does not work
1827 7.3.482 with 'cursorbind' set moving up/down does not keep the column
3003 7.3.483 (after 7.3.477) more prompt shows up too ofte.
2206 7.3.484 "vim --help" does not mention -E and --echo-wid
1677 7.3.485 LDFLAGS isn't passed on to building xxd
1803 7.3.486 build error with mingw64 on Windows 7
19665 7.3.487 column position is reset unnecessarily when setting an option
1458 7.3.488 ":help!" in a help file does not work as documented
2783 7.3.489 Insert mode CTRL-] does not expand abbr. from a mapping
74085 7.3.490 Lua interface: Member confusion, missing luaeval()
7738 7.3.491 no tests for Lua
14093 7.3.492 can't indent conditions separately from function arguments
1565 7.3.493 (after 7.3.492) two unused variables
6811 7.3.494 (after 7.3.491) can't build with Lua 9.1 or dynamic Lua
3559 7.3.495 (after 7.3.492) compiler warnings
2262 7.3.496 MS-DOS: tests fail when "diff" trips over line separators
1606 7.3.497 crash when doing ":python print", compiled with gcc -O2
2021 7.3.498 the behavior of "- register changes depending on 'clipboard'
2561 7.3.499 may wait for the wrong child process to terminate
1414 7.3.500 Ming makefile unconditionally sets WINVER
1761 7.3.501 error for "flush" not being defined when using Ruby command
2010 7.3.502 Netbeans insert halfway a line actually appends to the line
1288 7.3.503 (after 7.3.501) warning for unused argument
2602 7.3.504 commands in help files are not highlighted
3376 7.3.505 test 11 fails on MS-Windows in some versions
3040 7.3.506 GTK gives an error when selecting a non-existent file
5241 7.3.507 overwriting existing file without question from file dialog
2838 7.3.508 default for v:register is not set
8621 7.3.509 'autochdir' causes :vimgrep to fail
1462 7.3.510 test 77 fails on Solaris 7
1563 7.3.511 crash when using FileReadCmd autocmd that does :e {file}
2049 7.3.512 undofile() returns a useless name when passed an empty string
3925 7.3.513 cannot use CTRL-E and CTRL-Y with "r"
7792 7.3.514 no completion for :history command
2073 7.3.515 'wildignorecase' only applies to the last part of the path

308
vim.spec
View File

@ -18,7 +18,7 @@
#used for pre-releases: #used for pre-releases:
%define beta %{nil} %define beta %{nil}
%define vimdir vim73%{?beta} %define vimdir vim73%{?beta}
%define patchlevel 471 %define patchlevel 515
Summary: The VIM editor Summary: The VIM editor
URL: http://www.vim.org/ URL: http://www.vim.org/
@ -30,7 +30,7 @@ Group: Applications/Editors
Source0: ftp://ftp.vim.org/pub/vim/unix/vim-%{baseversion}%{?beta}%{?CVSDATE}.tar.bz2 Source0: ftp://ftp.vim.org/pub/vim/unix/vim-%{baseversion}%{?beta}%{?CVSDATE}.tar.bz2
Source3: gvim.desktop Source3: gvim.desktop
Source4: vimrc Source4: vimrc
#Source5: ftp://ftp.vim.org/pub/vim/patches/README.patches Source5: ftp://ftp.vim.org/pub/vim/patches/README.patches
Source7: gvim16.png Source7: gvim16.png
Source8: gvim32.png Source8: gvim32.png
Source9: gvim48.png Source9: gvim48.png
@ -527,6 +527,50 @@ Patch468: ftp://ftp.vim.org/pub/vim/patches/7.3/7.3.468
Patch469: ftp://ftp.vim.org/pub/vim/patches/7.3/7.3.469 Patch469: ftp://ftp.vim.org/pub/vim/patches/7.3/7.3.469
Patch470: ftp://ftp.vim.org/pub/vim/patches/7.3/7.3.470 Patch470: ftp://ftp.vim.org/pub/vim/patches/7.3/7.3.470
Patch471: ftp://ftp.vim.org/pub/vim/patches/7.3/7.3.471 Patch471: ftp://ftp.vim.org/pub/vim/patches/7.3/7.3.471
Patch472: ftp://ftp.vim.org/pub/vim/patches/7.3/7.3.472
Patch473: ftp://ftp.vim.org/pub/vim/patches/7.3/7.3.473
Patch474: ftp://ftp.vim.org/pub/vim/patches/7.3/7.3.474
Patch475: ftp://ftp.vim.org/pub/vim/patches/7.3/7.3.475
Patch476: ftp://ftp.vim.org/pub/vim/patches/7.3/7.3.476
Patch477: ftp://ftp.vim.org/pub/vim/patches/7.3/7.3.477
Patch478: ftp://ftp.vim.org/pub/vim/patches/7.3/7.3.478
Patch479: ftp://ftp.vim.org/pub/vim/patches/7.3/7.3.479
Patch480: ftp://ftp.vim.org/pub/vim/patches/7.3/7.3.480
Patch481: ftp://ftp.vim.org/pub/vim/patches/7.3/7.3.481
Patch482: ftp://ftp.vim.org/pub/vim/patches/7.3/7.3.482
Patch483: ftp://ftp.vim.org/pub/vim/patches/7.3/7.3.483
Patch484: ftp://ftp.vim.org/pub/vim/patches/7.3/7.3.484
Patch485: ftp://ftp.vim.org/pub/vim/patches/7.3/7.3.485
Patch486: ftp://ftp.vim.org/pub/vim/patches/7.3/7.3.486
Patch487: ftp://ftp.vim.org/pub/vim/patches/7.3/7.3.487
Patch488: ftp://ftp.vim.org/pub/vim/patches/7.3/7.3.488
Patch489: ftp://ftp.vim.org/pub/vim/patches/7.3/7.3.489
Patch490: ftp://ftp.vim.org/pub/vim/patches/7.3/7.3.490
Patch491: ftp://ftp.vim.org/pub/vim/patches/7.3/7.3.491
Patch492: ftp://ftp.vim.org/pub/vim/patches/7.3/7.3.492
Patch493: ftp://ftp.vim.org/pub/vim/patches/7.3/7.3.493
Patch494: ftp://ftp.vim.org/pub/vim/patches/7.3/7.3.494
Patch495: ftp://ftp.vim.org/pub/vim/patches/7.3/7.3.495
Patch496: ftp://ftp.vim.org/pub/vim/patches/7.3/7.3.496
Patch497: ftp://ftp.vim.org/pub/vim/patches/7.3/7.3.497
Patch498: ftp://ftp.vim.org/pub/vim/patches/7.3/7.3.498
Patch499: ftp://ftp.vim.org/pub/vim/patches/7.3/7.3.499
Patch500: ftp://ftp.vim.org/pub/vim/patches/7.3/7.3.500
Patch501: ftp://ftp.vim.org/pub/vim/patches/7.3/7.3.501
Patch502: ftp://ftp.vim.org/pub/vim/patches/7.3/7.3.502
Patch503: ftp://ftp.vim.org/pub/vim/patches/7.3/7.3.503
Patch504: ftp://ftp.vim.org/pub/vim/patches/7.3/7.3.504
Patch505: ftp://ftp.vim.org/pub/vim/patches/7.3/7.3.505
Patch506: ftp://ftp.vim.org/pub/vim/patches/7.3/7.3.506
Patch507: ftp://ftp.vim.org/pub/vim/patches/7.3/7.3.507
Patch508: ftp://ftp.vim.org/pub/vim/patches/7.3/7.3.508
Patch509: ftp://ftp.vim.org/pub/vim/patches/7.3/7.3.509
Patch510: ftp://ftp.vim.org/pub/vim/patches/7.3/7.3.510
Patch511: ftp://ftp.vim.org/pub/vim/patches/7.3/7.3.511
Patch512: ftp://ftp.vim.org/pub/vim/patches/7.3/7.3.512
Patch513: ftp://ftp.vim.org/pub/vim/patches/7.3/7.3.513
Patch514: ftp://ftp.vim.org/pub/vim/patches/7.3/7.3.514
Patch515: ftp://ftp.vim.org/pub/vim/patches/7.3/7.3.515
Patch3000: vim-7.3-syntax.patch Patch3000: vim-7.3-syntax.patch
Patch3002: vim-7.1-nowarnings.patch Patch3002: vim-7.1-nowarnings.patch
@ -1143,6 +1187,50 @@ perl -pi -e "s,bin/nawk,bin/awk,g" runtime/tools/mve.awk
%patch469 -p0 %patch469 -p0
%patch470 -p0 %patch470 -p0
%patch471 -p0 %patch471 -p0
%patch472 -p0
%patch473 -p0
%patch474 -p0
%patch475 -p0
%patch476 -p0
%patch477 -p0
%patch478 -p0
%patch479 -p0
%patch480 -p0
%patch481 -p0
%patch482 -p0
%patch483 -p0
%patch484 -p0
%patch485 -p0
%patch486 -p0
%patch487 -p0
%patch488 -p0
%patch489 -p0
%patch490 -p0
%patch491 -p0
%patch492 -p0
%patch493 -p0
%patch494 -p0
%patch495 -p0
%patch496 -p0
%patch497 -p0
%patch498 -p0
%patch499 -p0
%patch500 -p0
%patch501 -p0
%patch502 -p0
%patch503 -p0
%patch504 -p0
%patch505 -p0
%patch506 -p0
%patch507 -p0
%patch508 -p0
%patch509 -p0
%patch510 -p0
%patch511 -p0
%patch512 -p0
%patch513 -p0
%patch514 -p0
%patch515 -p0
# install spell files # install spell files
@ -1163,6 +1251,7 @@ perl -pi -e "s,bin/nawk,bin/awk,g" runtime/tools/mve.awk
%patch3011 -p1 %patch3011 -p1
%build %build
cp -f %{SOURCE5} .
cd src cd src
autoconf autoconf
@ -1416,7 +1505,7 @@ rm -rf $RPM_BUILD_ROOT
%files common %files common
%defattr(-,root,root) %defattr(-,root,root)
%config(noreplace) %{_sysconfdir}/vimrc %config(noreplace) %{_sysconfdir}/vimrc
%doc README* LICENSE %doc README* LICENSE
%doc runtime/docs %doc runtime/docs
%doc Changelog.rpm %doc Changelog.rpm
%dir %{_datadir}/%{name} %dir %{_datadir}/%{name}
@ -1597,8 +1686,8 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/icons/hicolor/*/apps/* %{_datadir}/icons/hicolor/*/apps/*
%changelog %changelog
* Wed Apr 11 2012 Daniel Mach <dmach@redhat.com> - 2:7.3.471-1.1 * Tue May 08 2012 Karsten Hopp <karsten@redhat.com> 7.3.515-1
- Rebuild for ruby - patchlevel 515
* Fri Mar 16 2012 Karsten Hopp <karsten@redhat.com> 7.3.471-1 * Fri Mar 16 2012 Karsten Hopp <karsten@redhat.com> 7.3.471-1
- patchlevel 471 - patchlevel 471
@ -1775,213 +1864,4 @@ rm -rf $RPM_BUILD_ROOT
* Wed Sep 22 2010 Karsten Hopp <karsten@redhat.com> 7.3.011-1 * Wed Sep 22 2010 Karsten Hopp <karsten@redhat.com> 7.3.011-1
- update to VIM 7.3 patchlevel 011 - update to VIM 7.3 patchlevel 011
* Tue Jul 27 2010 Mamoru Tasaka <mtasaka@ioa.s.u-tokyo.ac.jp> 7.2.446-2
- Rebuild against python 2.7
* Tue Jul 13 2010 Karsten Hopp <karsten@redhat.com> 7.2.446-1
- patchlevel 446
* Thu Jul 08 2010 Karsten Hopp <karsten@redhat.com> 7.2.445-1
- patchlevel 445
* Wed Jun 23 2010 Karsten Hopp <karsten@redhat.com> 7.2.444-2
- rebuild with perl-5.12
* Sun Jun 13 2010 Karsten Hopp <karsten@redhat.com> 7.2.444-1
- patchlevel 444
* Sun Jun 13 2010 Karsten Hopp <karsten@redhat.com> 7.2.443-1
- patchlevel 443
* Sat Jun 05 2010 Karsten Hopp <karsten@redhat.com> 7.2.442-1
- patchlevel 442
* Wed Jun 02 2010 Marcela Maslanova <mmaslano@redhat.com> - 2:7.2.441-2
- Mass rebuild with perl-5.12.0
* Sun May 30 2010 Karsten Hopp <karsten@redhat.com> 7.2.441-1
- patchlevel 441
* Sat May 29 2010 Karsten Hopp <karsten@redhat.com> 7.2.440-1
- patchlevel 440
* Wed May 26 2010 Karsten Hopp <karsten@redhat.com> 7.2.438-1
- patchlevel 438
* Sat May 22 2010 Karsten Hopp <karsten@redhat.com> 7.2.437-1
- patchlevel 437
* Sun May 16 2010 Karsten Hopp <karsten@redhat.com> 7.2.436-1
- patchlevel 436
* Sat May 15 2010 Karsten Hopp <karsten@redhat.com> 7.2.433-1
- patchlevel 433
* Fri May 14 2010 Karsten Hopp <karsten@redhat.com> 7.2.427-1
- patchlevel 427
* Thu May 13 2010 Karsten Hopp <karsten@redhat.com> 7.2.422-1
- patchlevel 422
* Fri May 07 2010 Karsten Hopp <karsten@redhat.com> 7.2.416-1
- patchlevel 416
* Tue Apr 20 2010 Karsten Hopp <karsten@redhat.com> 7.2.411-2
- fix rvim manpage (#583180)
* Wed Mar 24 2010 Karsten Hopp <karsten@redhat.com> 7.2.411-1
- patchlevel 411
* Tue Mar 23 2010 Karsten Hopp <karsten@redhat.com> 7.2.410-1
- patchlevel 410
* Sat Mar 20 2010 Karsten Hopp <karsten@redhat.com> 7.2.403-1
- patchlevel 403
* Thu Mar 18 2010 Karsten Hopp <karsten@redhat.com> 7.2.402-1
- patchlevel 402
* Wed Mar 17 2010 Karsten Hopp <karsten@redhat.com> 7.2.399-1
- patchlevel 399
* Wed Mar 10 2010 Karsten Hopp <karsten@redhat.com> 7.2.394-1
- patchlevel 394
* Wed Mar 03 2010 Karsten Hopp <karsten@redhat.com> 7.2.385-1
- patchlevel 385
* Tue Mar 02 2010 Karsten Hopp <karsten@redhat.com> 7.2.384-1
- patchlevel 384
* Tue Mar 02 2010 Karsten Hopp <karsten@redhat.com> 7.2.381-1
- patchlevel 381
* Sat Feb 27 2010 Karsten Hopp <karsten@redhat.com> 7.2.377-1
- patchlevel 377
* Wed Feb 24 2010 Karsten Hopp <karsten@redhat.com> 7.2.376-1
- patchlevel 376
* Thu Feb 18 2010 Karsten Hopp <karsten@redhat.com> 7.2.368-1
- patchlevel 368
* Thu Feb 18 2010 Karsten Hopp <karsten@redhat.com> 7.2.367-1
- patchlevel 367
* Wed Feb 17 2010 Karsten Hopp <karsten@redhat.com> 7.2.365-1
- patchlevel 365
* Fri Feb 12 2010 Karsten Hopp <karsten@redhat.com> 7.2.359-1
- patchlevel 359
* Thu Feb 11 2010 Karsten Hopp <karsten@redhat.com> 7.2.357-1
- patchlevel 357
* Thu Feb 04 2010 Karsten Hopp <karsten@redhat.com> 7.2.356-1
- patchlevel 356
* Wed Feb 03 2010 Karsten Hopp <karsten@redhat.com> 7.2.354-1
- patchlevel 354
* Fri Jan 29 2010 Karsten Hopp <karsten@redhat.com> 7.2.351-1
- patchlevel 351
* Thu Jan 28 2010 Karsten Hopp <karsten@redhat.com> 7.2.350-1
- patchlevel 350
* Mon Dec 7 2009 Stepan Kasal <skasal@redhat.com> - 2:7.2.315-2
- rebuild against perl 5.10.1
* Wed Dec 03 2009 Karsten Hopp <karsten@redhat.com> 7.2.315-1
- patchlevel 315
- fix vimrc location in man page (#456992)
- correct syntax highlighting of httpd config files in /etc/httpd (#499123)
- Buildrequire ruby, ruby-devel (#503872)
- Remove check for static gravity (#510307)
- sort tags file (#517725)
- use one gvim to open multiple file selections from nautilus (#519265)
- use elinks -source instead of elinks -dump (#518791)
- add ext4 keyword to /etc/fstab syntax highlighting (#498290)
* Mon Nov 09 2009 Karsten Hopp <karsten@redhat.com> 7.2.284-1
- patchlevel 284
* Thu Aug 20 2009 Karsten Hopp <karsten@redhat.com> 7.2.245-3
- change range of system ids in /etc/profile.d/vim/* (#518555)
* Mon Aug 03 2009 Karsten Hopp <karsten@redhat.com> 7.2.245-2
- add fix for glibc fortify segfault (#514717, Adam Tkac)
* Sat Aug 01 2009 Karsten Hopp <karsten@redhat.com> 7.2.245-1
- add 97 upstream patches to get to patchlevel 245
* Sun Jul 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2:7.2.148-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
* Fri Mar 27 2009 Karsten Hopp <karsten@redhat.com> 7.2.148-1
- patchlevel 148, fixes #461417
* Tue Mar 10 2009 Karsten Hopp <karsten@redhat.com> 7.2.132-1
- patchlevel 132, fixes accesses to freed memory
* Wed Mar 04 2009 Karsten Hopp <karsten@redhat.com> 7.2.131-1
- patchlevel 131
* Tue Feb 24 2009 Karsten Hopp <karsten@redhat.com> 7.2.127-1
- patchlevel 127
* Mon Feb 23 2009 Karsten Hopp <karsten@redhat.com> 7.2.124-1
- patchlevel 124
* Mon Jan 26 2009 Karsten Hopp <karsten@redhat.com> 7.2.088-1
- patchlevel 88
* Thu Jan 08 2009 Karsten Hopp <karsten@redhat.com> 7.2.079-2
- patchlevel 79
* Thu Dec 04 2008 Jesse Keating <jkeating@redhat.com> - 7.2.060-2
- Rebuild for new python.
* Mon Dec 01 2008 Karsten Hopp <karsten@redhat.com> 7.2.060-1
- patchlevel 60
* Mon Nov 10 2008 Karsten Hopp <karsten@redhat.com> 7.2.032-1
- patchlevel 32
* Mon Nov 03 2008 Karsten Hopp <karsten@redhat.com> 7.2.026-2
- add more /usr/share/vim/vimfiles directories (#444387)
* Mon Nov 03 2008 Karsten Hopp <karsten@redhat.com> 7.2.026-1
- patchlevel 26
- own some directories in /usr/share/vim/vimfiles (#469491)
* Tue Oct 21 2008 Karsten Hopp <karsten@redhat.com> 7.2.025-2
- re-enable clean
* Mon Oct 20 2008 Karsten Hopp <karsten@redhat.com> 7.2.025-1
- patchlevel 25
- add Categories tag to desktop file (#226526)
- add requirement on hicolor-icon-theme to vim-X11 (#226526)
- drop Amiga info files (#226526)
- remove non-utf8 man pages (#226526)
- drop Application from categories (#226526)
* Tue Sep 30 2008 Karsten Hopp <karsten@redhat.com> 7.2.022-1
- patchlevel 22
* Mon Sep 08 2008 Karsten Hopp <karsten@redhat.com> 7.2.013-1
- patchlevel 13
* Mon Aug 25 2008 Karsten Hopp <karsten@redhat.com> 7.2.006-1
- patchlevel 6
* Mon Aug 18 2008 Karsten Hopp <karsten@redhat.com> 7.2.002-1
- patchlevel 2
- fix specfile template (#446070)
- old specfile changelog moved to Changelog.rpm
* Fri Aug 14 2008 Karsten Hopp <karsten@redhat.com> 7.2.000-1
- vim 7.2
- drop 330 patches
# vim:nrformats-=octal # vim:nrformats-=octal