packages: vim/7.3.020 (NEW), vim/7.3.021 (NEW), vim/7.3.022 (NEW), vim/7.3....
wrobell
wrobell at pld-linux.org
Thu Oct 14 08:26:53 CEST 2010
Author: wrobell Date: Thu Oct 14 06:26:53 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- ver. 7.3.027
---- Files affected:
packages/vim:
7.3.020 (NONE -> 1.1) (NEW), 7.3.021 (NONE -> 1.1) (NEW), 7.3.022 (NONE -> 1.1) (NEW), 7.3.023 (NONE -> 1.1) (NEW), 7.3.024 (NONE -> 1.1) (NEW), 7.3.025 (NONE -> 1.1) (NEW), 7.3.026 (NONE -> 1.1) (NEW), 7.3.027 (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: packages/vim/7.3.020
diff -u /dev/null packages/vim/7.3.020:1.1
--- /dev/null Thu Oct 14 08:26:54 2010
+++ packages/vim/7.3.020 Thu Oct 14 08:26:48 2010
@@ -0,0 +1,131 @@
+To: vim-dev at vim.org
+Subject: Patch 7.3.020
+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.020
+Problem: Cursor position wrong when joining multiple lines and
+ 'formatoptions' contains "a". (Moshe Kamensky)
+Solution: Adjust cursor position for skipped indent. (Carlo Teubner)
+Files: src/ops.c, src/testdir/test68.in, src/testdir/test68.ok
+
+
+*** ../vim-7.3.019/src/ops.c 2010-08-15 21:57:28.000000000 +0200
+--- src/ops.c 2010-10-09 17:00:35.000000000 +0200
+***************
+*** 4153,4161 ****
+ int save_undo;
+ {
+ char_u *curr = NULL;
+ char_u *cend;
+ char_u *newp;
+! char_u *spaces; /* number of spaces inserte before a line */
+ int endcurr1 = NUL;
+ int endcurr2 = NUL;
+ int currsize = 0; /* size of the current line */
+--- 4153,4162 ----
+ int save_undo;
+ {
+ char_u *curr = NULL;
++ char_u *curr_start = NULL;
+ char_u *cend;
+ char_u *newp;
+! char_u *spaces; /* number of spaces inserted before a line */
+ int endcurr1 = NUL;
+ int endcurr2 = NUL;
+ int currsize = 0; /* size of the current line */
+***************
+*** 4181,4187 ****
+ */
+ for (t = 0; t < count; ++t)
+ {
+! curr = ml_get((linenr_T)(curwin->w_cursor.lnum + t));
+ if (insert_space && t > 0)
+ {
+ curr = skipwhite(curr);
+--- 4182,4188 ----
+ */
+ for (t = 0; t < count; ++t)
+ {
+! curr = curr_start = ml_get((linenr_T)(curwin->w_cursor.lnum + t));
+ if (insert_space && t > 0)
+ {
+ curr = skipwhite(curr);
+***************
+*** 4265,4274 ****
+ copy_spaces(cend, (size_t)(spaces[t]));
+ }
+ mark_col_adjust(curwin->w_cursor.lnum + t, (colnr_T)0, (linenr_T)-t,
+! (long)(cend - newp + spaces[t]));
+ if (t == 0)
+ break;
+! curr = ml_get((linenr_T)(curwin->w_cursor.lnum + t - 1));
+ if (insert_space && t > 1)
+ curr = skipwhite(curr);
+ currsize = (int)STRLEN(curr);
+--- 4266,4275 ----
+ copy_spaces(cend, (size_t)(spaces[t]));
+ }
+ mark_col_adjust(curwin->w_cursor.lnum + t, (colnr_T)0, (linenr_T)-t,
+! (long)(cend - newp + spaces[t] - (curr - curr_start)));
+ if (t == 0)
+ break;
+! curr = curr_start = ml_get((linenr_T)(curwin->w_cursor.lnum + t - 1));
+ if (insert_space && t > 1)
+ curr = skipwhite(curr);
+ currsize = (int)STRLEN(curr);
+*** ../vim-7.3.019/src/testdir/test68.in 2010-08-15 21:57:29.000000000 +0200
+--- src/testdir/test68.in 2010-10-09 16:53:02.000000000 +0200
+***************
+*** 51,56 ****
+--- 51,67 ----
+ }
+
+ STARTTEST
++ /^{/+2
++ :set tw& fo=a
++ I^^
++ ENDTEST
++
++ {
++ 1aa
++ 2bb
++ }
++
++ STARTTEST
+ :g/^STARTTEST/.,/^ENDTEST/d
+ :1;/^Results/,$wq! test.out
+ ENDTEST
+*** ../vim-7.3.019/src/testdir/test68.ok 2010-08-15 21:57:29.000000000 +0200
+--- src/testdir/test68.ok 2010-10-09 16:53:02.000000000 +0200
+***************
+*** 33,35 ****
+--- 33,38 ----
+ #a b
+ }
+
++
++ { 1aa ^^2bb }
++
+*** ../vim-7.3.019/src/version.c 2010-09-30 21:03:13.000000000 +0200
+--- src/version.c 2010-10-09 17:05:31.000000000 +0200
+***************
+*** 716,717 ****
+--- 716,719 ----
+ { /* Add new patch number below this line */
++ /**/
++ 20,
+ /**/
+
+--
+Did you hear about the new 3 million dollar West Virginia State Lottery?
+The winner gets 3 dollars a year for a million years.
+
+ /// 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 ///
================================================================
Index: packages/vim/7.3.021
diff -u /dev/null packages/vim/7.3.021:1.1
--- /dev/null Thu Oct 14 08:26:54 2010
+++ packages/vim/7.3.021 Thu Oct 14 08:26:48 2010
@@ -0,0 +1,70 @@
+To: vim-dev at vim.org
+Subject: Patch 7.3.021
+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.021
+Problem: Conflict for defining Boolean in Mac header files.
+Solution: Define NO_X11_INCLUDES. (Rainer Muller)
+Files: src/os_macosx.m, src/vim.h
+
+
+*** ../vim-7.3.020/src/os_macosx.m 2010-08-15 21:57:29.000000000 +0200
+--- src/os_macosx.m 2010-10-10 17:01:55.000000000 +0200
+***************
+*** 15,20 ****
+--- 15,24 ----
+ Error: MACOS 9 is no longer supported in Vim 7
+ #endif
+
++ /* Avoid a conflict for the definition of Boolean between Mac header files and
++ * X11 header files. */
++ #define NO_X11_INCLUDES
++
+ #include "vim.h"
+ #import <Cocoa/Cocoa.h>
+
+*** ../vim-7.3.020/src/vim.h 2010-08-15 21:57:29.000000000 +0200
+--- src/vim.h 2010-10-10 17:02:56.000000000 +0200
+***************
+*** 192,199 ****
+ #endif
+
+ #ifdef NO_X11_INCLUDES
+! /* In os_mac_conv.c NO_X11_INCLUDES is defined to avoid X11 headers.
+! * Disable all X11 related things to avoid conflicts. */
+ # ifdef FEAT_X11
+ # undef FEAT_X11
+ # endif
+--- 192,199 ----
+ #endif
+
+ #ifdef NO_X11_INCLUDES
+! /* In os_mac_conv.c and os_macosx.m NO_X11_INCLUDES is defined to avoid
+! * X11 headers. Disable all X11 related things to avoid conflicts. */
+ # ifdef FEAT_X11
+ # undef FEAT_X11
+ # endif
+*** ../vim-7.3.020/src/version.c 2010-10-09 17:21:42.000000000 +0200
+--- src/version.c 2010-10-10 17:05:19.000000000 +0200
+***************
+*** 716,717 ****
+--- 716,719 ----
+ { /* Add new patch number below this line */
++ /**/
++ 21,
+ /**/
+
+--
+hundred-and-one symptoms of being an internet addict:
+259. When you enter your name in the AltaVista search engine, the top ten
+ matches do indeed refer to you.
+
+ /// 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 ///
================================================================
Index: packages/vim/7.3.022
diff -u /dev/null packages/vim/7.3.022:1.1
--- /dev/null Thu Oct 14 08:26:54 2010
+++ packages/vim/7.3.022 Thu Oct 14 08:26:48 2010
@@ -0,0 +1,54 @@
+To: vim-dev at vim.org
+Subject: Patch 7.3.022
+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.022
+Problem: When opening a new window the 'spellcapcheck' option is cleared.
+Solution: Copy the correct option value. (Christian Brabandt)
+Files: src/option.c
+
+
+*** ../vim-7.3.021/src/option.c 2010-08-15 21:57:28.000000000 +0200
+--- src/option.c 2010-10-13 13:48:46.000000000 +0200
+***************
+*** 10011,10017 ****
+ buf->b_p_smc = p_smc;
+ #endif
+ #ifdef FEAT_SPELL
+! buf->b_s.b_p_spc = vim_strsave(p_spf);
+ (void)compile_cap_prog(&buf->b_s);
+ buf->b_s.b_p_spf = vim_strsave(p_spf);
+ buf->b_s.b_p_spl = vim_strsave(p_spl);
+--- 10011,10017 ----
+ buf->b_p_smc = p_smc;
+ #endif
+ #ifdef FEAT_SPELL
+! buf->b_s.b_p_spc = vim_strsave(p_spc);
+ (void)compile_cap_prog(&buf->b_s);
+ buf->b_s.b_p_spf = vim_strsave(p_spf);
+ buf->b_s.b_p_spl = vim_strsave(p_spl);
+*** ../vim-7.3.021/src/version.c 2010-10-10 17:08:28.000000000 +0200
+--- src/version.c 2010-10-13 14:02:08.000000000 +0200
+***************
+*** 716,717 ****
+--- 716,719 ----
+ { /* Add new patch number below this line */
++ /**/
++ 22,
+ /**/
+
+--
+GALAHAD: Camelot ...
+LAUNCELOT: Camelot ...
+GAWAIN: It's only a model.
+ "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD
+
+ /// 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 ///
================================================================
Index: packages/vim/7.3.023
diff -u /dev/null packages/vim/7.3.023:1.1
--- /dev/null Thu Oct 14 08:26:54 2010
+++ packages/vim/7.3.023 Thu Oct 14 08:26:48 2010
@@ -0,0 +1,69 @@
+To: vim-dev at vim.org
+Subject: Patch 7.3.023
+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.023
+Problem: External program may hang when it tries to write to the tty.
+Solution: Don't close the slave tty until after the child exits. (Nikola
+ Knezevic)
+Files: src/os_unix.c
+
+
+*** ../vim-7.3.022/src/os_unix.c 2010-09-21 22:09:28.000000000 +0200
+--- src/os_unix.c 2010-10-13 16:17:33.000000000 +0200
+***************
+*** 4168,4174 ****
+ # ifdef FEAT_GUI
+ if (pty_master_fd >= 0)
+ {
+- close(pty_slave_fd); /* close slave side of pty */
+ fromshell_fd = pty_master_fd;
+ toshell_fd = dup(pty_master_fd);
+ }
+--- 4168,4173 ----
+***************
+*** 4637,4642 ****
+--- 4636,4649 ----
+ break;
+ }
+
++ # ifdef FEAT_GUI
++ /* Close slave side of pty. Only do this after the child has
++ * exited, otherwise the child may hang when it tries to write on
++ * the pty. */
++ if (pty_master_fd >= 0)
++ close(pty_slave_fd);
++ # endif
++
+ /* Make sure the child that writes to the external program is
+ * dead. */
+ if (wpid > 0)
+*** ../vim-7.3.022/src/version.c 2010-10-13 14:05:29.000000000 +0200
+--- src/version.c 2010-10-13 16:20:48.000000000 +0200
+***************
+*** 716,717 ****
+--- 716,719 ----
+ { /* Add new patch number below this line */
++ /**/
++ 23,
+ /**/
+
+--
+ 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 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 ///
================================================================
Index: packages/vim/7.3.024
diff -u /dev/null packages/vim/7.3.024:1.1
--- /dev/null Thu Oct 14 08:26:54 2010
+++ packages/vim/7.3.024 Thu Oct 14 08:26:48 2010
@@ -0,0 +1,115 @@
+To: vim-dev at vim.org
+Subject: Patch 7.3.024
+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.024
+Problem: Named signs do not use a negative number as intended.
+Solution: Fix the numbering of named signs. (Xavier de Gaye)
+Files: src/ex_cmds.c
+
+
+*** ../vim-7.3.023/src/ex_cmds.c 2010-09-21 16:56:29.000000000 +0200
+--- src/ex_cmds.c 2010-10-13 16:37:18.000000000 +0200
+***************
+*** 6670,6680 ****
+ sp = (sign_T *)alloc_clear((unsigned)sizeof(sign_T));
+ if (sp == NULL)
+ return;
+- if (sp_prev == NULL)
+- first_sign = sp;
+- else
+- sp_prev->sn_next = sp;
+- sp->sn_name = vim_strnsave(arg, (int)(p - arg));
+
+ /* If the name is a number use that for the typenr,
+ * otherwise use a negative number. */
+--- 6670,6675 ----
+***************
+*** 6687,6699 ****
+
+ for (lp = first_sign; lp != NULL; lp = lp->sn_next)
+ {
+! if (lp->sn_typenr == last_sign_typenr)
+ {
+ --last_sign_typenr;
+ if (last_sign_typenr == 0)
+ last_sign_typenr = MAX_TYPENR;
+ if (last_sign_typenr == start)
+ {
+ EMSG(_("E612: Too many signs defined"));
+ return;
+ }
+--- 6682,6695 ----
+
+ for (lp = first_sign; lp != NULL; lp = lp->sn_next)
+ {
+! if (lp->sn_typenr == -last_sign_typenr)
+ {
+ --last_sign_typenr;
+ if (last_sign_typenr == 0)
+ last_sign_typenr = MAX_TYPENR;
+ if (last_sign_typenr == start)
+ {
++ vim_free(sp);
+ EMSG(_("E612: Too many signs defined"));
+ return;
+ }
+***************
+*** 6702,6711 ****
+ }
+ }
+
+! sp->sn_typenr = last_sign_typenr--;
+! if (last_sign_typenr == 0)
+ last_sign_typenr = MAX_TYPENR; /* wrap around */
+ }
+ }
+
+ /* set values for a defined sign. */
+--- 6698,6714 ----
+ }
+ }
+
+! sp->sn_typenr = -last_sign_typenr;
+! if (--last_sign_typenr == 0)
+ last_sign_typenr = MAX_TYPENR; /* wrap around */
+ }
++
++ /* add the new sign to the list of signs */
++ if (sp_prev == NULL)
++ first_sign = sp;
++ else
++ sp_prev->sn_next = sp;
++ sp->sn_name = vim_strnsave(arg, (int)(p - arg));
+ }
+
+ /* set values for a defined sign. */
+*** ../vim-7.3.023/src/version.c 2010-10-13 16:22:05.000000000 +0200
+--- src/version.c 2010-10-13 16:42:14.000000000 +0200
+***************
+*** 716,717 ****
+--- 716,719 ----
+ { /* Add new patch number below this line */
++ /**/
++ 24,
+ /**/
+
+--
+ 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 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 ///
================================================================
Index: packages/vim/7.3.025
diff -u /dev/null packages/vim/7.3.025:1.1
--- /dev/null Thu Oct 14 08:26:54 2010
+++ packages/vim/7.3.025 Thu Oct 14 08:26:48 2010
@@ -0,0 +1,136 @@
+To: vim-dev at vim.org
+Subject: Patch 7.3.025
+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.025
+Problem: ":mksession" does not square brackets escape file name properly.
+Solution: Improve escapging of file names. (partly by Peter Odding)
+Files: src/ex_docmd.c
+
+
+*** ../vim-7.3.024/src/ex_docmd.c 2010-09-21 16:56:29.000000000 +0200
+--- src/ex_docmd.c 2010-10-13 17:39:17.000000000 +0200
+***************
+*** 10708,10714 ****
+ * Write a file name to the session file.
+ * Takes care of the "slash" option in 'sessionoptions' and escapes special
+ * characters.
+! * Returns FAIL if writing fails.
+ */
+ static int
+ ses_put_fname(fd, name, flagp)
+--- 10708,10714 ----
+ * Write a file name to the session file.
+ * Takes care of the "slash" option in 'sessionoptions' and escapes special
+ * characters.
+! * Returns FAIL if writing fails or out of memory.
+ */
+ static int
+ ses_put_fname(fd, name, flagp)
+***************
+*** 10717,10765 ****
+ unsigned *flagp;
+ {
+ char_u *sname;
+ int retval = OK;
+- int c;
+
+ sname = home_replace_save(NULL, name);
+! if (sname != NULL)
+! name = sname;
+! while (*name != NUL)
+! {
+! #ifdef FEAT_MBYTE
+! {
+! int l;
+
+! if (has_mbyte && (l = (*mb_ptr2len)(name)) > 1)
+! {
+! /* copy a multibyte char */
+! while (--l >= 0)
+! {
+! if (putc(*name, fd) != *name)
+! retval = FAIL;
+! ++name;
+! }
+! continue;
+! }
+! }
+! #endif
+! c = *name++;
+! if (c == '\\' && (*flagp & SSOP_SLASH))
+! /* change a backslash to a forward slash */
+! c = '/';
+! else if ((vim_strchr(escape_chars, c) != NULL
+! #ifdef BACKSLASH_IN_FILENAME
+! && c != '\\'
+! #endif
+! ) || c == '#' || c == '%')
+! {
+! /* escape a special character with a backslash */
+! if (putc('\\', fd) != '\\')
+! retval = FAIL;
+! }
+! if (putc(c, fd) != c)
+! retval = FAIL;
+ }
+ vim_free(sname);
+ return retval;
+ }
+
+--- 10717,10748 ----
+ unsigned *flagp;
+ {
+ char_u *sname;
++ char_u *p;
+ int retval = OK;
+
+ sname = home_replace_save(NULL, name);
+! if (sname == NULL)
+! return FAIL;
+
+! if (*flagp & SSOP_SLASH)
+! {
+! /* change all backslashes to forward slashes */
+! for (p = sname; *p != NUL; mb_ptr_adv(p))
+! if (*p == '\\')
+! *p = '/';
+ }
++
++ /* escapse special characters */
++ p = vim_strsave_fnameescape(sname, FALSE);
+ vim_free(sname);
++ if (p == NULL)
++ return FAIL;
++
++ /* write the result */
++ if (fputs((char *)p, fd) < 0)
++ retval = FAIL;
++
++ vim_free(p);
+ return retval;
+ }
+
+*** ../vim-7.3.024/src/version.c 2010-10-13 16:44:17.000000000 +0200
+--- src/version.c 2010-10-13 17:49:15.000000000 +0200
+***************
+*** 716,717 ****
<<Diff was trimmed, longer than 597 lines>>
More information about the pld-cvs-commit
mailing list