packages: vim/vim.spec, vim/7.3.100 (NEW), vim/7.3.101 (NEW), vim/7.3.102 (...
glen
glen at pld-linux.org
Mon Jan 24 13:52:00 CET 2011
Author: glen Date: Mon Jan 24 12:52:00 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- up to 7.3.107
---- Files affected:
packages/vim:
vim.spec (1.543 -> 1.544) , 7.3.100 (NONE -> 1.1) (NEW), 7.3.101 (NONE -> 1.1) (NEW), 7.3.102 (NONE -> 1.1) (NEW), 7.3.103 (NONE -> 1.1) (NEW), 7.3.104 (NONE -> 1.1) (NEW), 7.3.105 (NONE -> 1.1) (NEW), 7.3.106 (NONE -> 1.1) (NEW), 7.3.107 (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: packages/vim/vim.spec
diff -u packages/vim/vim.spec:1.543 packages/vim/vim.spec:1.544
--- packages/vim/vim.spec:1.543 Sat Jan 22 15:06:34 2011
+++ packages/vim/vim.spec Mon Jan 24 13:51:54 2011
@@ -26,7 +26,7 @@
# curl -s ftp://ftp.vim.org/pub/editors/vim/patches/7.3/MD5SUMS | grep -vF .gz | tail -n1 | awk '{print $2}'
%define ver 7.3
-%define patchlevel 099
+%define patchlevel 107
%define rel 1
Summary: Vi IMproved - a Vi clone
Summary(de.UTF-8): VIsual editor iMproved
@@ -1393,6 +1393,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.544 2011/01/24 12:51:54 glen
+- up to 7.3.107
+
Revision 1.543 2011/01/22 14:06:34 qboosh
- fixed/completed pl
- removed bogus da "translation"
================================================================
Index: packages/vim/7.3.100
diff -u /dev/null packages/vim/7.3.100:1.1
--- /dev/null Mon Jan 24 13:52:00 2011
+++ packages/vim/7.3.100 Mon Jan 24 13:51:54 2011
@@ -0,0 +1,52 @@
+To: vim_dev at googlegroups.com
+Subject: Patch 7.3.100
+Fcc: outbox
+From: Bram Moolenaar <Bram at moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.3.100
+Problem: When using :normal v:count isn't set.
+Solution: Call normal_cmd() with toplevel set to TRUE.
+Files: src/ex_docmd.c
+
+
+*** ../vim-7.3.099/src/ex_docmd.c 2010-12-02 16:01:23.000000000 +0100
+--- src/ex_docmd.c 2011-01-06 17:23:43.000000000 +0100
+***************
+*** 9310,9316 ****
+ && !got_int)
+ {
+ update_topline_cursor();
+! normal_cmd(&oa, FALSE); /* execute a Normal mode cmd */
+ }
+ }
+ #endif
+--- 9310,9316 ----
+ && !got_int)
+ {
+ update_topline_cursor();
+! normal_cmd(&oa, TRUE); /* execute a Normal mode cmd */
+ }
+ }
+ #endif
+*** ../vim-7.3.099/src/version.c 2011-01-08 14:45:57.000000000 +0100
+--- src/version.c 2011-01-17 19:49:07.000000000 +0100
+***************
+*** 716,717 ****
+--- 716,719 ----
+ { /* Add new patch number below this line */
++ /**/
++ 100,
+ /**/
+
+--
+hundred-and-one symptoms of being an internet addict:
+109. You actually read -- and enjoy -- lists like this.
+
+ /// Bram Moolenaar -- Bram at 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 ///
================================================================
Index: packages/vim/7.3.101
diff -u /dev/null packages/vim/7.3.101:1.1
--- /dev/null Mon Jan 24 13:52:00 2011
+++ packages/vim/7.3.101 Mon Jan 24 13:51:54 2011
@@ -0,0 +1,92 @@
+To: vim_dev at googlegroups.com
+Subject: Patch 7.3.1
+Fcc: outbox
+From: Bram Moolenaar <Bram at moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.3.101
+Problem: ino_t defined with wrong size.
+Solution: Move including auto/config.h before other includes. (Marius
+ Geminas)
+Files: src/if_ruby.c, src/if_lua.c
+
+
+*** ../vim-7.3.100/src/if_ruby.c 2010-12-24 13:39:29.000000000 +0100
+--- src/if_ruby.c 2011-01-09 14:43:14.000000000 +0100
+***************
+*** 11,23 ****
+ * See README.txt for an overview of the Vim source code.
+ */
+
+- #include <stdio.h>
+- #include <string.h>
+-
+ #ifdef HAVE_CONFIG_H
+ # include "auto/config.h"
+ #endif
+
+ #ifdef _WIN32
+ # if !defined(DYNAMIC_RUBY_VER) || (DYNAMIC_RUBY_VER < 18)
+ # define NT
+--- 11,23 ----
+ * See README.txt for an overview of the Vim source code.
+ */
+
+ #ifdef HAVE_CONFIG_H
+ # include "auto/config.h"
+ #endif
+
++ #include <stdio.h>
++ #include <string.h>
++
+ #ifdef _WIN32
+ # if !defined(DYNAMIC_RUBY_VER) || (DYNAMIC_RUBY_VER < 18)
+ # define NT
+*** ../vim-7.3.100/src/if_lua.c 2010-10-23 14:02:48.000000000 +0200
+--- src/if_lua.c 2011-01-09 14:46:46.000000000 +0100
+***************
+*** 9,20 ****
+ * See README.txt for an overview of the Vim source code.
+ */
+
+! #include <stdio.h>
+! #include <string.h>
+ #include <lua.h>
+ #include <lualib.h>
+ #include <lauxlib.h>
+- #include "vim.h"
+
+ /* Only do the following when the feature is enabled. Needed for "make
+ * depend". */
+--- 9,19 ----
+ * See README.txt for an overview of the Vim source code.
+ */
+
+! #include "vim.h"
+!
+ #include <lua.h>
+ #include <lualib.h>
+ #include <lauxlib.h>
+
+ /* Only do the following when the feature is enabled. Needed for "make
+ * depend". */
+*** ../vim-7.3.100/src/version.c 2011-01-17 19:50:01.000000000 +0100
+--- src/version.c 2011-01-17 19:51:40.000000000 +0100
+***************
+*** 716,717 ****
+--- 716,719 ----
+ { /* Add new patch number below this line */
++ /**/
++ 101,
+ /**/
+
+--
+In a world without walls and borders, who needs windows and gates?
+
+ /// Bram Moolenaar -- Bram at 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 ///
================================================================
Index: packages/vim/7.3.102
diff -u /dev/null packages/vim/7.3.102:1.1
--- /dev/null Mon Jan 24 13:52:00 2011
+++ packages/vim/7.3.102 Mon Jan 24 13:51:54 2011
@@ -0,0 +1,615 @@
+To: vim_dev at googlegroups.com
+Subject: Patch 7.3.102
+Fcc: outbox
+From: Bram Moolenaar <Bram at moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.3.102
+Problem: When using ":make", typing the next command and then getting the
+ "reload" prompt the next command is (partly) eaten by the reload
+ prompt.
+Solution: Accept ':' as a special character at the reload prompt to accept
+ the default choice and execute the command.
+Files: src/eval.c, src/fileio.c, src/gui.c, src/gui_xmdlg.c,
+ src/memline.c, src/message.c, src/proto/message.pro,
+ src/gui_athena.c, src/gui_gtk.c, src/gui_mac.c, src/gui_motif.c,
+ src/gui_photon.c, src/gui_w16.c, src/gui_w32.c, src/os_mswin.c
+ src/proto/gui_athena.pro, src/proto/gui_gtk.pro,
+ src/proto/gui_mac.pro, src/proto/gui_motif.pro,
+ src/proto/gui_photon.pro, src/proto/gui_w16.pro,
+ src/proto/gui_w32.pro
+
+
+*** ../vim-7.3.101/src/eval.c 2011-01-04 19:03:22.000000000 +0100
+--- src/eval.c 2011-01-16 00:14:21.000000000 +0100
+***************
+*** 9323,9329 ****
+
+ if (!error)
+ rettv->vval.v_number = do_dialog(type, NULL, message, buttons,
+! def, NULL);
+ #endif
+ }
+
+--- 9323,9329 ----
+
+ if (!error)
+ rettv->vval.v_number = do_dialog(type, NULL, message, buttons,
+! def, NULL, FALSE);
+ #endif
+ }
+
+***************
+*** 12744,12750 ****
+ IObuff[0] = NUL;
+ if (message != NULL && defstr != NULL
+ && do_dialog(VIM_QUESTION, NULL, message,
+! (char_u *)_("&OK\n&Cancel"), 1, IObuff) == 1)
+ rettv->vval.v_string = vim_strsave(IObuff);
+ else
+ {
+--- 12744,12750 ----
+ IObuff[0] = NUL;
+ if (message != NULL && defstr != NULL
+ && do_dialog(VIM_QUESTION, NULL, message,
+! (char_u *)_("&OK\n&Cancel"), 1, IObuff, FALSE) == 1)
+ rettv->vval.v_string = vim_strsave(IObuff);
+ else
+ {
+*** ../vim-7.3.101/src/fileio.c 2010-12-17 18:06:00.000000000 +0100
+--- src/fileio.c 2011-01-16 00:14:37.000000000 +0100
+***************
+*** 7008,7014 ****
+ STRCAT(tbuf, mesg2);
+ }
+ if (do_dialog(VIM_WARNING, (char_u *)_("Warning"), tbuf,
+! (char_u *)_("&OK\n&Load File"), 1, NULL) == 2)
+ reload = TRUE;
+ }
+ else
+--- 7008,7014 ----
+ STRCAT(tbuf, mesg2);
+ }
+ if (do_dialog(VIM_WARNING, (char_u *)_("Warning"), tbuf,
+! (char_u *)_("&OK\n&Load File"), 1, NULL, TRUE) == 2)
+ reload = TRUE;
+ }
+ else
+*** ../vim-7.3.101/src/gui.c 2010-10-20 19:17:43.000000000 +0200
+--- src/gui.c 2011-01-16 00:14:56.000000000 +0100
+***************
+*** 4903,4909 ****
+ if (STRLEN(p) > 2000)
+ STRCPY(p + 2000 - 14, "...(truncated)");
+ (void)do_dialog(VIM_ERROR, (char_u *)_("Error"),
+! p, (char_u *)_("&Ok"), 1, NULL);
+ break;
+ }
+ ga_clear(&error_ga);
+--- 4903,4909 ----
+ if (STRLEN(p) > 2000)
+ STRCPY(p + 2000 - 14, "...(truncated)");
+ (void)do_dialog(VIM_ERROR, (char_u *)_("Error"),
+! p, (char_u *)_("&Ok"), 1, NULL, FALSE);
+ break;
+ }
+ ga_clear(&error_ga);
+*** ../vim-7.3.101/src/gui_xmdlg.c 2010-08-15 21:57:32.000000000 +0200
+--- src/gui_xmdlg.c 2011-01-16 00:15:33.000000000 +0100
+***************
+*** 688,694 ****
+ do_dialog(VIM_ERROR,
+ (char_u *)_("Error"),
+ (char_u *)_("Invalid font specification"),
+! (char_u *)_("&Dismiss"), 1, NULL);
+
+ return True;
+ }
+--- 688,694 ----
+ do_dialog(VIM_ERROR,
+ (char_u *)_("Error"),
+ (char_u *)_("Invalid font specification"),
+! (char_u *)_("&Dismiss"), 1, NULL, FALSE);
+
+ return True;
+ }
+***************
+*** 807,813 ****
+ do_dialog(VIM_ERROR,
+ (char_u *)_("Error"),
+ (char_u *)_("Invalid font specification"),
+! (char_u *)_("&Dismiss"), 1, NULL);
+ XFreeFontNames(name);
+ }
+ else
+--- 807,813 ----
+ do_dialog(VIM_ERROR,
+ (char_u *)_("Error"),
+ (char_u *)_("Invalid font specification"),
+! (char_u *)_("&Dismiss"), 1, NULL, FALSE);
+ XFreeFontNames(name);
+ }
+ else
+*** ../vim-7.3.101/src/memline.c 2010-12-17 20:23:56.000000000 +0100
+--- src/memline.c 2011-01-16 00:15:47.000000000 +0100
+***************
+*** 4516,4522 ****
+ process_still_running
+ ? (char_u *)_("&Open Read-Only\n&Edit anyway\n&Recover\n&Quit\n&Abort") :
+ # endif
+! (char_u *)_("&Open Read-Only\n&Edit anyway\n&Recover\n&Delete it\n&Quit\n&Abort"), 1, NULL);
+
+ # if defined(UNIX) || defined(__EMX__) || defined(VMS)
+ if (process_still_running && choice >= 4)
+--- 4516,4522 ----
+ process_still_running
+ ? (char_u *)_("&Open Read-Only\n&Edit anyway\n&Recover\n&Quit\n&Abort") :
+ # endif
+! (char_u *)_("&Open Read-Only\n&Edit anyway\n&Recover\n&Delete it\n&Quit\n&Abort"), 1, NULL, FALSE);
+
+ # if defined(UNIX) || defined(__EMX__) || defined(VMS)
+ if (process_still_running && choice >= 4)
+*** ../vim-7.3.101/src/message.c 2011-01-04 19:25:46.000000000 +0100
+--- src/message.c 2011-01-17 19:57:30.000000000 +0100
+***************
+*** 3315,3321 ****
+ * different letter.
+ */
+ int
+! do_dialog(type, title, message, buttons, dfltbutton, textfield)
+ int type UNUSED;
+ char_u *title UNUSED;
+ char_u *message;
+--- 3315,3321 ----
+ * different letter.
+ */
+ int
+! do_dialog(type, title, message, buttons, dfltbutton, textfield, ex_cmd)
+ int type UNUSED;
+ char_u *title UNUSED;
+ char_u *message;
+***************
+*** 3323,3328 ****
+--- 3323,3330 ----
+ int dfltbutton;
+ char_u *textfield UNUSED; /* IObuff for inputdialog(), NULL
+ otherwise */
++ int ex_cmd; /* when TRUE pressing : accepts default and starts
++ Ex command */
+ {
+ int oldState;
+ int retval = 0;
+***************
+*** 3341,3347 ****
+ if (gui.in_use && vim_strchr(p_go, GO_CONDIALOG) == NULL)
+ {
+ c = gui_mch_dialog(type, title, message, buttons, dfltbutton,
+! textfield);
+ /* avoid a hit-enter prompt without clearing the cmdline */
+ need_wait_return = FALSE;
+ emsg_on_display = FALSE;
+--- 3343,3349 ----
+ if (gui.in_use && vim_strchr(p_go, GO_CONDIALOG) == NULL)
+ {
+ c = gui_mch_dialog(type, title, message, buttons, dfltbutton,
+! textfield, ex_cmd);
+ /* avoid a hit-enter prompt without clearing the cmdline */
+ need_wait_return = FALSE;
+ emsg_on_display = FALSE;
+***************
+*** 3388,3393 ****
+--- 3390,3402 ----
+ default: /* Could be a hotkey? */
+ if (c < 0) /* special keys are ignored here */
+ continue;
++ if (c == ':' && ex_cmd)
++ {
++ retval = dfltbutton;
++ ins_char_typebuf(':');
++ break;
++ }
++
+ /* Make the character lowercase, as chars in "hotkeys" are. */
+ c = MB_TOLOWER(c);
+ retval = 1;
+***************
+*** 3661,3667 ****
+ if (do_dialog(type,
+ title == NULL ? (char_u *)_("Question") : title,
+ message,
+! (char_u *)_("&Yes\n&No"), dflt, NULL) == 1)
+ return VIM_YES;
+ return VIM_NO;
+ }
+--- 3670,3676 ----
+ if (do_dialog(type,
+ title == NULL ? (char_u *)_("Question") : title,
+ message,
+! (char_u *)_("&Yes\n&No"), dflt, NULL, FALSE) == 1)
+ return VIM_YES;
+ return VIM_NO;
+ }
+***************
+*** 3676,3682 ****
+ switch (do_dialog(type,
+ title == NULL ? (char_u *)_("Question") : title,
+ message,
+! (char_u *)_("&Yes\n&No\n&Cancel"), dflt, NULL))
+ {
+ case 1: return VIM_YES;
+ case 2: return VIM_NO;
+--- 3685,3691 ----
+ switch (do_dialog(type,
+ title == NULL ? (char_u *)_("Question") : title,
+ message,
+! (char_u *)_("&Yes\n&No\n&Cancel"), dflt, NULL, FALSE))
+ {
+ case 1: return VIM_YES;
+ case 2: return VIM_NO;
+***************
+*** 3695,3701 ****
+ title == NULL ? (char_u *)"Question" : title,
+ message,
+ (char_u *)_("&Yes\n&No\nSave &All\n&Discard All\n&Cancel"),
+! dflt, NULL))
+ {
+ case 1: return VIM_YES;
+ case 2: return VIM_NO;
+--- 3704,3710 ----
+ title == NULL ? (char_u *)"Question" : title,
+ message,
+ (char_u *)_("&Yes\n&No\nSave &All\n&Discard All\n&Cancel"),
+! dflt, NULL, FALSE))
+ {
+ case 1: return VIM_YES;
+ case 2: return VIM_NO;
+*** ../vim-7.3.101/src/proto/message.pro 2010-10-20 21:22:17.000000000 +0200
+--- src/proto/message.pro 2011-01-16 00:22:36.000000000 +0100
+***************
+*** 64,70 ****
+ int verbose_open __ARGS((void));
+ void give_warning __ARGS((char_u *message, int hl));
+ void msg_advance __ARGS((int col));
+! int do_dialog __ARGS((int type, char_u *title, char_u *message, char_u *buttons, int dfltbutton, char_u *textfield));
+ void display_confirm_msg __ARGS((void));
+ int vim_dialog_yesno __ARGS((int type, char_u *title, char_u *message, int dflt));
+ int vim_dialog_yesnocancel __ARGS((int type, char_u *title, char_u *message, int dflt));
+--- 64,70 ----
+ int verbose_open __ARGS((void));
+ void give_warning __ARGS((char_u *message, int hl));
+ void msg_advance __ARGS((int col));
+! int do_dialog __ARGS((int type, char_u *title, char_u *message, char_u *buttons, int dfltbutton, char_u *textfield, int ex_cmd));
+ void display_confirm_msg __ARGS((void));
+ int vim_dialog_yesno __ARGS((int type, char_u *title, char_u *message, int dflt));
+ int vim_dialog_yesnocancel __ARGS((int type, char_u *title, char_u *message, int dflt));
+*** ../vim-7.3.101/src/gui_athena.c 2010-08-15 21:57:25.000000000 +0200
+--- src/gui_athena.c 2011-01-16 00:18:47.000000000 +0100
+***************
+*** 2117,2129 ****
+ }
+
+ int
+! gui_mch_dialog(type, title, message, buttons, dfltbutton, textfield)
+ int type UNUSED;
+ char_u *title;
+ char_u *message;
+ char_u *buttons;
+ int dfltbutton UNUSED;
+ char_u *textfield;
+ {
+ char_u *buts;
+ char_u *p, *next;
+--- 2117,2130 ----
+ }
+
+ int
+! gui_mch_dialog(type, title, message, buttons, dfltbutton, textfield, ex_cmd)
+ int type UNUSED;
+ char_u *title;
+ char_u *message;
+ char_u *buttons;
+ int dfltbutton UNUSED;
+ char_u *textfield;
++ int ex_cmd UNUSED;
+ {
+ char_u *buts;
+ char_u *p, *next;
+*** ../vim-7.3.101/src/gui_gtk.c 2010-12-08 13:11:15.000000000 +0100
+--- src/gui_gtk.c 2011-01-16 00:24:44.000000000 +0100
+***************
+*** 1268,1274 ****
+ char_u *message, /* message text */
+ char_u *buttons, /* names of buttons */
+ int def_but, /* default button */
+! char_u *textfield) /* text for textfield or NULL */
+ {
+ GtkWidget *dialog;
+ GtkWidget *entry = NULL;
+--- 1268,1275 ----
+ char_u *message, /* message text */
+ char_u *buttons, /* names of buttons */
+ int def_but, /* default button */
+! char_u *textfield, /* text for textfield or NULL */
+! int ex_cmd UNUSED)
+ {
+ GtkWidget *dialog;
+ GtkWidget *entry = NULL;
+*** ../vim-7.3.101/src/gui_mac.c 2010-09-21 17:34:26.000000000 +0200
+--- src/gui_mac.c 2011-01-16 00:19:52.000000000 +0100
+***************
+*** 5583,5589 ****
+ char_u *message,
+ char_u *buttons,
+ int dfltbutton,
+! char_u *textfield)
+ {
+ Handle buttonDITL;
+ Handle iconDITL;
+--- 5583,5590 ----
+ char_u *message,
+ char_u *buttons,
+ int dfltbutton,
+! char_u *textfield,
+! int ex_cmd)
+ {
+ Handle buttonDITL;
+ Handle iconDITL;
+*** ../vim-7.3.101/src/gui_motif.c 2010-08-15 21:57:28.000000000 +0200
+--- src/gui_motif.c 2011-01-16 00:20:14.000000000 +0100
+***************
+*** 2549,2561 ****
+ #endif
+
+ int
+! gui_mch_dialog(type, title, message, button_names, dfltbutton, textfield)
+ int type UNUSED;
+ char_u *title;
+ char_u *message;
+ char_u *button_names;
+ int dfltbutton;
+ char_u *textfield; /* buffer of size IOSIZE */
+ {
+ char_u *buts;
+ char_u *p, *next;
+--- 2549,2562 ----
+ #endif
+
+ int
+! gui_mch_dialog(type, title, message, button_names, dfltbutton, textfield, ex_cmd)
+ int type UNUSED;
+ char_u *title;
+ char_u *message;
+ char_u *button_names;
+ int dfltbutton;
+ char_u *textfield; /* buffer of size IOSIZE */
++ int ex_cmd UNUSED;
+ {
+ char_u *buts;
+ char_u *p, *next;
+*** ../vim-7.3.101/src/gui_photon.c 2010-08-15 21:57:27.000000000 +0200
+--- src/gui_photon.c 2011-01-16 00:20:28.000000000 +0100
+***************
+*** 1502,1508 ****
+ char_u *message,
+ char_u *buttons,
+ int default_button,
+! char_u *textfield)
+ {
+ char_u *str;
+ char_u **button_array;
+--- 1502,1509 ----
+ char_u *message,
+ char_u *buttons,
+ int default_button,
+! char_u *textfield,
+! int ex_cmd)
+ {
+ char_u *str;
+ char_u **button_array;
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/vim/vim.spec?r1=1.543&r2=1.544&f=u
More information about the pld-cvs-commit
mailing list