r985 - in /trunk/packages/vim: debian/README debian/changelog patches/gui_gtk_x11.c_g_thread_init.diff patches/series upstream/patches/7.1.019 upstream/patches/7.1.020 upstream/patches/7.1.021 upstream/patches/7.1.022
jamessan at users.alioth.debian.org
jamessan at users.alioth.debian.org
Sat Jul 7 19:05:23 UTC 2007
Author: jamessan
Date: Sat Jul 7 19:05:23 2007
New Revision: 985
URL: http://svn.debian.org/wsvn/pkg-vim/?sc=1&rev=985
Log:
* New upstream patches (001 - 022), see README.gz for details.
* Add gui_gtk_x11.c_g_thread_init.diff, which prevents a glib warning
related to glib 2.10's Memory Slices and threads. (Closes: #428854)
Added:
trunk/packages/vim/patches/gui_gtk_x11.c_g_thread_init.diff
trunk/packages/vim/upstream/patches/7.1.019
trunk/packages/vim/upstream/patches/7.1.020
trunk/packages/vim/upstream/patches/7.1.021
trunk/packages/vim/upstream/patches/7.1.022
Modified:
trunk/packages/vim/debian/README
trunk/packages/vim/debian/changelog
trunk/packages/vim/patches/series
Modified: trunk/packages/vim/debian/README
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/debian/README?rev=985&op=diff
==============================================================================
--- trunk/packages/vim/debian/README (original)
+++ trunk/packages/vim/debian/README Sat Jul 7 19:05:23 2007
@@ -43,3 +43,7 @@
2368 7.1.016 (after 7.1.012) error message when using ":cwindow"
6729 7.1.017 ":confirm w" does not give a prompt when file is read-only
1771 7.1.018 "p" at end of line doesn't work right when 've' is set
+ 1650 7.1.019 ":python" doesn't mention the command is not implemented
+ 3229 7.1.020 reading uninitialized memory when using a dialog
+ 2875 7.1.021 (after 7.1.015) MzScheme interface doesn't build on Win32
+ 1842 7.1.022 when setting 'keymap' twice b:keymap_name variable isn't set
Modified: trunk/packages/vim/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/debian/changelog?rev=985&op=diff
==============================================================================
--- trunk/packages/vim/debian/changelog (original)
+++ trunk/packages/vim/debian/changelog Sat Jul 7 19:05:23 2007
@@ -1,7 +1,7 @@
-vim (1:7.1-018+1) UNRELEASED; urgency=low
+vim (1:7.1-022+1) unstable; urgency=low
[ Debian Vim Maintainers ]
- * New upstream patches (001 - 018), see README.gz for details.
+ * New upstream patches (001 - 022), see README.gz for details.
+ Load all matching files in $VIMRUNTIME when using ":syn include"
(Closes: #395517)
@@ -31,6 +31,8 @@
- set 'nomodeline' by default since modelines have historically been a
source of security/resource vulnerabilities. Users should have to
explicitly enable the option to assume the associated risks.
+ * Add gui_gtk_x11.c_g_thread_init.diff, which prevents a glib warning
+ related to glib 2.10's Memory Slices and threads. (Closes: #428854)
[ Stefano Zacchiroli ]
* Add javac_cmdline-vim.diff, which fixes the invocation of the javac
@@ -49,7 +51,7 @@
* Add map.vim-syntax.diff which ships syntax file for UMN map server
(Closes: #355900)
- -- James Vega <jamessan at debian.org> Sat, 30 Jun 2007 13:08:19 -0400
+ -- James Vega <jamessan at debian.org> Sat, 07 Jul 2007 15:04:57 -0400
vim (1:7.1-000+1) unstable; urgency=low
Added: trunk/packages/vim/patches/gui_gtk_x11.c_g_thread_init.diff
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/patches/gui_gtk_x11.c_g_thread_init.diff?rev=985&op=file
==============================================================================
--- trunk/packages/vim/patches/gui_gtk_x11.c_g_thread_init.diff (added)
+++ trunk/packages/vim/patches/gui_gtk_x11.c_g_thread_init.diff Sat Jul 7 19:05:23 2007
@@ -1,0 +1,13 @@
+Index: vim/src/gui_gtk_x11.c
+===================================================================
+--- vim/src/gui_gtk_x11.c.orig
++++ vim/src/gui_gtk_x11.c
+@@ -1575,6 +1575,8 @@
+ #endif
+
+ #ifdef FEAT_GUI_GNOME
++ if (!g_thread_supported())
++ g_thread_init(NULL);
+ if (gtk_socket_id == 0)
+ using_gnome = 1;
+ #endif
Modified: trunk/packages/vim/patches/series
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/patches/series?rev=985&op=diff
==============================================================================
--- trunk/packages/vim/patches/series (original)
+++ trunk/packages/vim/patches/series Sat Jul 7 19:05:23 2007
@@ -18,3 +18,4 @@
debchangelog-closes_omni.vim.diff -p0
map.vim-syntax.diff -p0
spell.c_getc-eof.diff -p0
+gui_gtk_x11.c_g_thread_init.diff -p0
Added: trunk/packages/vim/upstream/patches/7.1.019
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.1.019?rev=985&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.1.019 (added)
+++ trunk/packages/vim/upstream/patches/7.1.019 Sat Jul 7 19:05:23 2007
@@ -1,0 +1,55 @@
+To: vim-dev at vim.org
+Subject: patch 7.1.019
+Fcc: outbox
+From: Bram Moolenaar <Bram at moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.1.019
+Problem: ":py" asks for an argument, ":py asd" then gives the error that
+ ":py" isn't implemented. Should already happen for ":py".
+Solution: Compare with ex_script_ni. (Chris Lubinski)
+Files: src/ex_docmd.c
+
+
+*** ../vim-7.1.018/src/ex_docmd.c Thu May 10 18:53:03 2007
+--- src/ex_docmd.c Sat Jun 23 13:36:37 2007
+***************
+*** 2118,2124 ****
+ #ifdef FEAT_USR_CMDS
+ !USER_CMDIDX(ea.cmdidx) &&
+ #endif
+! cmdnames[ea.cmdidx].cmd_func == ex_ni);
+
+ #ifndef FEAT_EVAL
+ /*
+--- 2118,2125 ----
+ #ifdef FEAT_USR_CMDS
+ !USER_CMDIDX(ea.cmdidx) &&
+ #endif
+! (cmdnames[ea.cmdidx].cmd_func == ex_ni
+! || cmdnames[ea.cmdidx].cmd_func == ex_script_ni));
+
+ #ifndef FEAT_EVAL
+ /*
+*** ../vim-7.1.018/src/version.c Thu Jun 28 22:14:28 2007
+--- src/version.c Thu Jul 5 09:48:11 2007
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 19,
+ /**/
+
+--
+MARTHA'S WAY: Don't throw out all that leftover wine. Freeze into ice cubes
+ for future use in casseroles and sauces.
+MY WAY: What leftover wine?
+
+ /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net \\\
+/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\ download, build and distribute -- http://www.A-A-P.org ///
+ \\\ help me help AIDS victims -- http://ICCF-Holland.org ///
Added: trunk/packages/vim/upstream/patches/7.1.020
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.1.020?rev=985&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.1.020 (added)
+++ trunk/packages/vim/upstream/patches/7.1.020 Sat Jul 7 19:05:23 2007
@@ -1,0 +1,115 @@
+To: vim-dev at vim.org
+Subject: patch 7.1.020
+Fcc: outbox
+From: Bram Moolenaar <Bram at moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.1.020
+Problem: Reading from uninitialized memory when using a dialog. (Dominique
+ Pelle)
+Solution: In msg_show_console_dialog() append a NUL after every appended
+ character.
+Files: src/message.c
+
+
+*** ../vim-7.1.019/src/message.c Thu May 10 18:49:39 2007
+--- src/message.c Sun Jul 1 12:06:52 2007
+***************
+*** 3456,3466 ****
+ /* advance to next hotkey and set default hotkey */
+ #ifdef FEAT_MBYTE
+ if (has_mbyte)
+! hotkp += (*mb_ptr2len)(hotkp);
+ else
+ #endif
+ ++hotkp;
+! (void)copy_char(r + 1, hotkp, TRUE);
+ if (dfltbutton)
+ --dfltbutton;
+
+--- 3456,3466 ----
+ /* advance to next hotkey and set default hotkey */
+ #ifdef FEAT_MBYTE
+ if (has_mbyte)
+! hotkp += STRLEN(hotkp);
+ else
+ #endif
+ ++hotkp;
+! hotkp[copy_char(r + 1, hotkp, TRUE)] = NUL;
+ if (dfltbutton)
+ --dfltbutton;
+
+***************
+*** 3493,3499 ****
+ *msgp++ = (dfltbutton == 1) ? ']' : ')';
+
+ /* redefine hotkey */
+! (void)copy_char(r, hotkp, TRUE);
+ }
+ }
+ else
+--- 3493,3499 ----
+ *msgp++ = (dfltbutton == 1) ? ']' : ')';
+
+ /* redefine hotkey */
+! hotkp[copy_char(r, hotkp, TRUE)] = NUL;
+ }
+ }
+ else
+***************
+*** 3519,3526 ****
+ *msgp++ = ':';
+ *msgp++ = ' ';
+ *msgp = NUL;
+- mb_ptr_adv(hotkp);
+- *hotkp = NUL;
+ }
+ else
+ {
+--- 3519,3524 ----
+***************
+*** 3555,3562 ****
+ msgp = confirm_msg + 1 + STRLEN(message);
+ hotkp = hotk;
+
+! /* define first default hotkey */
+! (void)copy_char(buttons, hotkp, TRUE);
+
+ /* Remember where the choices start, displaying starts here when
+ * "hotkp" typed at the more prompt. */
+--- 3553,3561 ----
+ msgp = confirm_msg + 1 + STRLEN(message);
+ hotkp = hotk;
+
+! /* Define first default hotkey. Keep the hotkey string NUL
+! * terminated to avoid reading past the end. */
+! hotkp[copy_char(buttons, hotkp, TRUE)] = NUL;
+
+ /* Remember where the choices start, displaying starts here when
+ * "hotkp" typed at the more prompt. */
+*** ../vim-7.1.019/src/version.c Thu Jul 5 09:53:20 2007
+--- src/version.c Thu Jul 5 10:09:34 2007
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 20,
+ /**/
+
+--
+BLACK KNIGHT: Come on you pansy!
+ [hah] [parry thrust]
+ [ARTHUR chops the BLACK KNIGHT's right arm off]
+ARTHUR: Victory is mine! [kneeling]
+ We thank thee Lord, that in thy merc-
+ [Black Knight kicks Arthur in the head while he is praying]
+ The Quest for the Holy Grail (Monty Python)
+
+ /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net \\\
+/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\ download, build and distribute -- http://www.A-A-P.org ///
+ \\\ help me help AIDS victims -- http://ICCF-Holland.org ///
Added: trunk/packages/vim/upstream/patches/7.1.021
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.1.021?rev=985&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.1.021 (added)
+++ trunk/packages/vim/upstream/patches/7.1.021 Sat Jul 7 19:05:23 2007
@@ -1,0 +1,92 @@
+To: vim-dev at vim.org
+Subject: patch 7.1.021
+Fcc: outbox
+From: Bram Moolenaar <Bram at moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.1.021 (after 7.1.015)
+Problem: Mzscheme interface doesn't compile on Win32.
+Solution: Fix the problem that 7.1.015 fixed in a better way. (Sergey Khorev)
+Files: src/if_mzsch.c
+
+
+*** ../vim-7.1.020/src/if_mzsch.c Thu Jun 28 13:02:22 2007
+--- src/if_mzsch.c Sun Jul 1 18:44:49 2007
+***************
+*** 308,313 ****
+--- 308,315 ----
+ static Scheme_Config *(*dll_scheme_current_config)(void);
+ static Scheme_Object *(*dll_scheme_char_string_to_byte_string)
+ (Scheme_Object *s);
++ static Scheme_Object *(*dll_scheme_char_string_to_path)
++ (Scheme_Object *s);
+ # endif
+
+ /* arrays are imported directly */
+***************
+*** 398,403 ****
+--- 400,407 ----
+ # define scheme_current_config dll_scheme_current_config
+ # define scheme_char_string_to_byte_string \
+ dll_scheme_char_string_to_byte_string
++ # define scheme_char_string_to_path \
++ dll_scheme_char_string_to_path
+ # endif
+
+ typedef struct
+***************
+*** 498,503 ****
+--- 502,509 ----
+ {"scheme_current_config", (void **)&dll_scheme_current_config},
+ {"scheme_char_string_to_byte_string",
+ (void **)&dll_scheme_char_string_to_byte_string},
++ {"scheme_char_string_to_path",
++ (void **)&dll_scheme_char_string_to_path},
+ # endif
+ {NULL, NULL}};
+
+***************
+*** 773,779 ****
+ #ifdef MZSCHEME_COLLECTS
+ /* setup 'current-library-collection-paths' parameter */
+ scheme_set_param(scheme_config, MZCONFIG_COLLECTION_PATHS,
+! scheme_build_list(0, scheme_make_string(MZSCHEME_COLLECTS)));
+ #endif
+ #ifdef HAVE_SANDBOX
+ /* setup sandbox guards */
+--- 779,793 ----
+ #ifdef MZSCHEME_COLLECTS
+ /* setup 'current-library-collection-paths' parameter */
+ scheme_set_param(scheme_config, MZCONFIG_COLLECTION_PATHS,
+! scheme_make_pair(
+! # if MZSCHEME_VERSION_MAJOR >= 299
+! scheme_char_string_to_path(
+! scheme_byte_string_to_char_string(
+! scheme_make_byte_string(MZSCHEME_COLLECTS))),
+! # else
+! scheme_make_string(MZSCHEME_COLLECTS),
+! # endif
+! scheme_null));
+ #endif
+ #ifdef HAVE_SANDBOX
+ /* setup sandbox guards */
+*** ../vim-7.1.020/src/version.c Thu Jul 5 10:10:29 2007
+--- src/version.c Fri Jul 6 19:41:04 2007
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 21,
+ /**/
+
+--
+Advice to worms: Sleep late.
+
+ /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net \\\
+/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\ download, build and distribute -- http://www.A-A-P.org ///
+ \\\ help me help AIDS victims -- http://ICCF-Holland.org ///
Added: trunk/packages/vim/upstream/patches/7.1.022
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.1.022?rev=985&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.1.022 (added)
+++ trunk/packages/vim/upstream/patches/7.1.022 Sat Jul 7 19:05:23 2007
@@ -1,0 +1,67 @@
+To: vim-dev at vim.org
+Subject: patch 7.1.022
+Fcc: outbox
+From: Bram Moolenaar <Bram at moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.1.022
+Problem: When setting 'keymap' twice the b:keymap_name variable isn't set.
+ (Milan Berta)
+Solution: Don't unlet b:keymap_name for ":loadkeymap". (Martin Toft)
+Files: src/digraph.c
+
+
+*** ../vim-7.1.021/src/digraph.c Wed May 3 00:07:11 2006
+--- src/digraph.c Mon Jul 2 21:24:30 2007
+***************
+*** 2349,2356 ****
+
+ if (*curbuf->b_p_keymap == NUL)
+ {
+! /* Stop any active keymap and clear the table. */
+ keymap_unload();
+ }
+ else
+ {
+--- 2349,2358 ----
+
+ if (*curbuf->b_p_keymap == NUL)
+ {
+! /* Stop any active keymap and clear the table. Also remove
+! * b:keymap_unload, as no keymap is active now. */
+ keymap_unload();
++ do_cmdline_cmd((char_u *)"unlet! b:keymap_name");
+ }
+ else
+ {
+***************
+*** 2500,2506 ****
+
+ ga_clear(&curbuf->b_kmap_ga);
+ curbuf->b_kmap_state &= ~KEYMAP_LOADED;
+- do_cmdline_cmd((char_u *)"unlet! b:keymap_name");
+ #ifdef FEAT_WINDOWS
+ status_redraw_curbuf();
+ #endif
+--- 2502,2507 ----
+*** ../vim-7.1.021/src/version.c Fri Jul 6 19:42:09 2007
+--- src/version.c Sat Jul 7 13:56:52 2007
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 22,
+ /**/
+
+--
+If your life is a hard drive,
+Christ can be your backup.
+
+ /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net \\\
+/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\ download, build and distribute -- http://www.A-A-P.org ///
+ \\\ help me help AIDS victims -- http://ICCF-Holland.org ///
More information about the pkg-vim-maintainers
mailing list