Author: wrobell Date: Tue Aug 1 16:44:22 2006 GMT Module: SOURCES Tag: HEAD ---- Log message: - vim 7.0 040-042 patches
---- Files affected: SOURCES: 7.0.040 (NONE -> 1.1) (NEW), 7.0.041 (NONE -> 1.1) (NEW), 7.0.042 (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: SOURCES/7.0.040 diff -u /dev/null SOURCES/7.0.040:1.1 --- /dev/null Tue Aug 1 18:44:22 2006 +++ SOURCES/7.0.040 Tue Aug 1 18:44:17 2006 @@ -0,0 +1,60 @@ +To: [email protected] +Subject: Patch 7.0.040 +Fcc: outbox +From: Bram Moolenaar <[EMAIL PROTECTED]> +Mime-Version: 1.0 +Content-Type: text/plain; charset=ISO-8859-1 +Content-Transfer-Encoding: 8bit +------------ + +Patch 7.0.040 +Problem: When 'cmdheight' is larger than 1 using inputlist() or selecting + a spell suggestion with the mouse gets the wrong entry. +Solution: Start listing the first alternative on the last line of the screen. +Files: src/eval.c, src/spell.c + + +*** ../vim-7.0.039/src/eval.c Thu Jul 13 08:30:50 2006 +--- src/eval.c Mon Jul 10 23:03:13 2006 +*************** +*** 11497,11502 **** +--- 11497,11503 ---- + } + + msg_start(); ++ msg_row = Rows - 1; /* for when 'cmdheight' > 1 */ + lines_left = Rows; /* avoid more prompt */ + msg_scroll = TRUE; + msg_clr_eos(); +*** ../vim-7.0.039/src/spell.c Sat May 13 14:12:51 2006 +--- src/spell.c Mon Jul 10 23:03:04 2006 +*************** +*** 10071,10076 **** +--- 10071,10077 ---- + + /* List the suggestions. */ + msg_start(); ++ msg_row = Rows - 1; /* for when 'cmdheight' > 1 */ + lines_left = Rows; /* avoid more prompt */ + vim_snprintf((char *)IObuff, IOSIZE, _("Change \"%.*s\" to:"), + sug.su_badlen, sug.su_badptr); +*** ../vim-7.0.039/src/version.c Thu Jul 13 08:30:50 2006 +--- src/version.c Sun Jul 23 21:51:04 2006 +*************** +*** 668,669 **** +--- 668,671 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 40, + /**/ + +-- +hundred-and-one symptoms of being an internet addict: +40. You tell the cab driver you live at + http://123.elm.street/house/bluetrim.html +41. You actually try that 123.elm.street address. + + /// Bram Moolenaar -- [EMAIL PROTECTED] -- 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: SOURCES/7.0.041 diff -u /dev/null SOURCES/7.0.041:1.1 --- /dev/null Tue Aug 1 18:44:22 2006 +++ SOURCES/7.0.041 Tue Aug 1 18:44:17 2006 @@ -0,0 +1,81 @@ +To: [email protected] +Subject: Patch 7.0.041 +Fcc: outbox +From: Bram Moolenaar <[EMAIL PROTECTED]> +Mime-Version: 1.0 +Content-Type: text/plain; charset=ISO-8859-1 +Content-Transfer-Encoding: 8bit +------------ + +Patch 7.0.041 +Problem: cursor([1, 1]) doesn't work. (Peter Hodge) +Solution: Allow leaving out the third item of the list and use zero for the + virtual column offset. +Files: src/eval.c + + +*** ../vim-7.0.040/src/eval.c Sun Jul 23 21:52:16 2006 +--- src/eval.c Mon Jul 10 23:03:13 2006 +*************** +*** 16465,16473 **** + long i = 0; + long n; + +! /* List must be: [fnum, lnum, col, coladd] */ +! if (arg->v_type != VAR_LIST || l == NULL +! || l->lv_len != (fnump == NULL ? 3 : 4)) + return FAIL; + + if (fnump != NULL) +--- 16465,16476 ---- + long i = 0; + long n; + +! /* List must be: [fnum, lnum, col, coladd], where "fnum" is only there +! * when "fnump" isn't NULL and "coladd" is optional. */ +! if (arg->v_type != VAR_LIST +! || l == NULL +! || l->lv_len < (fnump == NULL ? 2 : 3) +! || l->lv_len > (fnump == NULL ? 3 : 4)) + return FAIL; + + if (fnump != NULL) +*************** +*** 16493,16500 **** + #ifdef FEAT_VIRTUALEDIT + n = list_find_nr(l, i, NULL); + if (n < 0) +! return FAIL; +! posp->coladd = n; + #endif + + return OK; +--- 16496,16504 ---- + #ifdef FEAT_VIRTUALEDIT + n = list_find_nr(l, i, NULL); + if (n < 0) +! posp->coladd = 0; +! else +! posp->coladd = n; + #endif + + return OK; +*** ../vim-7.0.040/src/version.c Sun Jul 23 21:52:16 2006 +--- src/version.c Sun Jul 23 21:59:43 2006 +*************** +*** 668,669 **** +--- 668,671 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 41, + /**/ + +-- +hundred-and-one symptoms of being an internet addict: +43. You tell the kids they can't use the computer because "Daddy's got work to + do" and you don't even have a job. + + /// Bram Moolenaar -- [EMAIL PROTECTED] -- 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: SOURCES/7.0.042 diff -u /dev/null SOURCES/7.0.042:1.1 --- /dev/null Tue Aug 1 18:44:22 2006 +++ SOURCES/7.0.042 Tue Aug 1 18:44:17 2006 @@ -0,0 +1,54 @@ +To: [email protected] +Subject: Patch 7.0.042 +Fcc: outbox +From: Bram Moolenaar <[EMAIL PROTECTED]> +Mime-Version: 1.0 +Content-Type: text/plain; charset=ISO-8859-1 +Content-Transfer-Encoding: 8bit +------------ + +Patch 7.0.042 +Problem: When pasting a block of text in Insert mode Vim hangs or crashes. + (Noam Halevy) +Solution: Avoid that the cursor is positioned past the NUL of a line. +Files: src/ops.c + + +*** ../vim-7.0.041/src/ops.c Tue Jun 20 20:29:13 2006 +--- src/ops.c Sun Jul 23 22:36:39 2006 +*************** +*** 3493,3500 **** +--- 3493,3507 ---- + # endif + if (flags & PUT_CURSEND) + { ++ colnr_T len; ++ + curwin->w_cursor = curbuf->b_op_end; + curwin->w_cursor.col++; ++ ++ /* in Insert mode we might be after the NUL, correct for that */ ++ len = (colnr_T)STRLEN(ml_get_curline()); ++ if (curwin->w_cursor.col > len) ++ curwin->w_cursor.col = len; + } + else + curwin->w_cursor.lnum = lnum; +*** ../vim-7.0.041/src/version.c Sun Jul 23 22:07:55 2006 +--- src/version.c Sun Jul 23 22:35:13 2006 +*************** +*** 668,669 **** +--- 668,671 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 42, + /**/ + +-- +hundred-and-one symptoms of being an internet addict: +45. You buy a Captain Kirk chair with a built-in keyboard and mouse. + + /// Bram Moolenaar -- [EMAIL PROTECTED] -- 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 /// ================================================================ _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
