Author: adamg Date: Sun Jun 25 11:01:09 2006 GMT Module: SOURCES Tag: HEAD ---- Log message: - new
---- Files affected: SOURCES: 7.0.023 (NONE -> 1.1) (NEW), 7.0.024 (NONE -> 1.1) (NEW), 7.0.025 (NONE -> 1.1) (NEW), 7.0.026 (NONE -> 1.1) (NEW), 7.0.029 (NONE -> 1.1) (NEW), 7.0.030 (NONE -> 1.1) (NEW), 7.0.031 (NONE -> 1.1) (NEW), 7.0.033 (NONE -> 1.1) (NEW), 7.0.034 (NONE -> 1.1) (NEW), 7.0.035 (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: SOURCES/7.0.023 diff -u /dev/null SOURCES/7.0.023:1.1 --- /dev/null Sun Jun 25 13:01:10 2006 +++ SOURCES/7.0.023 Sun Jun 25 13:01:03 2006 @@ -0,0 +1,170 @@ +To: [email protected] +Subject: Patch 7.0.023 +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.023 +Problem: Crash when doing spell completion in an empty line and pressing + CTRL-E. +Solution: Check for a zero pointer. (James Vega) + Also handle a situation without a matching pattern better, report + "No matches" instead of remaining in undefined CTRL-X mode. And + get out of CTRL-X mode when typing a letter. +Files: src/edit.c + + +*** ../vim-7.0.022/src/edit.c Sat May 13 15:27:57 2006 +--- src/edit.c Thu Jun 22 16:44:01 2006 +*************** +*** 719,727 **** + #ifdef FEAT_INS_EXPAND + /* + * Special handling of keys while the popup menu is visible or wanted +! * and the cursor is still in the completed word. + */ +! if (compl_started && pum_wanted() && curwin->w_cursor.col >= compl_col) + { + /* BS: Delete one character from "compl_leader". */ + if ((c == K_BS || c == Ctrl_H) +--- 721,734 ---- + #ifdef FEAT_INS_EXPAND + /* + * Special handling of keys while the popup menu is visible or wanted +! * and the cursor is still in the completed word. Only when there is +! * a match, skip this when no matches were found. + */ +! if (compl_started +! && pum_wanted() +! && curwin->w_cursor.col >= compl_col +! && (compl_shown_match == NULL +! || compl_shown_match != compl_shown_match->cp_next)) + { + /* BS: Delete one character from "compl_leader". */ + if ((c == K_BS || c == Ctrl_H) +*************** +*** 3393,3408 **** + ptr = compl_leader; + else + ptr = compl_orig_text; +! p = compl_orig_text; +! for (temp = 0; p[temp] != NUL && p[temp] == ptr[temp]; ++temp) +! ; + #ifdef FEAT_MBYTE +! if (temp > 0) +! temp -= (*mb_head_off)(compl_orig_text, p + temp); + #endif +! for (p += temp; *p != NUL; mb_ptr_adv(p)) +! AppendCharToRedobuff(K_BS); +! AppendToRedobuffLit(ptr + temp, -1); + } + + #ifdef FEAT_CINDENT +--- 3401,3421 ---- + ptr = compl_leader; + else + ptr = compl_orig_text; +! if (compl_orig_text != NULL) +! { +! p = compl_orig_text; +! for (temp = 0; p[temp] != NUL && p[temp] == ptr[temp]; +! ++temp) +! ; + #ifdef FEAT_MBYTE +! if (temp > 0) +! temp -= (*mb_head_off)(compl_orig_text, p + temp); + #endif +! for (p += temp; *p != NUL; mb_ptr_adv(p)) +! AppendCharToRedobuff(K_BS); +! } +! if (ptr != NULL) +! AppendToRedobuffLit(ptr + temp, -1); + } + + #ifdef FEAT_CINDENT +*************** +*** 4650,4659 **** + (int)STRLEN(compl_pattern), curs_col); + if (compl_xp.xp_context == EXPAND_UNSUCCESSFUL + || compl_xp.xp_context == EXPAND_NOTHING) +! return FAIL; +! startcol = (int)(compl_xp.xp_pattern - compl_pattern); +! compl_col = startcol; +! compl_length = curs_col - startcol; + } + else if (ctrl_x_mode == CTRL_X_FUNCTION || ctrl_x_mode == CTRL_X_OMNI) + { +--- 4663,4680 ---- + (int)STRLEN(compl_pattern), curs_col); + if (compl_xp.xp_context == EXPAND_UNSUCCESSFUL + || compl_xp.xp_context == EXPAND_NOTHING) +! { +! compl_col = curs_col; +! compl_length = 0; +! vim_free(compl_pattern); +! compl_pattern = NULL; +! } +! else +! { +! startcol = (int)(compl_xp.xp_pattern - compl_pattern); +! compl_col = startcol; +! compl_length = curs_col - startcol; +! } + } + else if (ctrl_x_mode == CTRL_X_FUNCTION || ctrl_x_mode == CTRL_X_OMNI) + { +*************** +*** 4707,4717 **** + else + compl_col = spell_word_start(startcol); + if (compl_col >= (colnr_T)startcol) +! return FAIL; +! spell_expand_check_cap(compl_col); + /* Need to obtain "line" again, it may have become invalid. */ + line = ml_get(curwin->w_cursor.lnum); +- compl_length = (int)curs_col - compl_col; + compl_pattern = vim_strnsave(line + compl_col, compl_length); + if (compl_pattern == NULL) + #endif +--- 4728,4744 ---- + else + compl_col = spell_word_start(startcol); + if (compl_col >= (colnr_T)startcol) +! { +! compl_length = 0; +! compl_col = curs_col; +! } +! else +! { +! spell_expand_check_cap(compl_col); +! compl_length = (int)curs_col - compl_col; +! } + /* Need to obtain "line" again, it may have become invalid. */ + line = ml_get(curwin->w_cursor.lnum); + compl_pattern = vim_strnsave(line + compl_col, compl_length); + if (compl_pattern == NULL) + #endif +*** ../vim-7.0.022/src/version.c Tue Jun 20 21:08:02 2006 +--- src/version.c Thu Jun 22 16:34:42 2006 +*************** +*** 668,669 **** +--- 668,671 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 23, + /**/ + +-- +BEDEVERE: Look! It's the old man from scene 24 - what's he Doing here? +ARTHUR: He is the keeper of the Bridge. He asks each traveler five + questions ... +GALAHAD: Three questions. + "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD + + /// 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.024 diff -u /dev/null SOURCES/7.0.024:1.1 --- /dev/null Sun Jun 25 13:01:10 2006 +++ SOURCES/7.0.024 Sun Jun 25 13:01:04 2006 @@ -0,0 +1,53 @@ +To: [email protected] +Subject: Patch 7.0.024 +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.024 +Problem: It is possible to set arbitrary "v:" variables. +Solution: Disallow setting "v:" variables that are not predefined. +Files: src/eval.c + + +*** ../vim-7.0.023/src/eval.c Sat May 13 13:36:47 2006 +--- src/eval.c Thu Jun 22 17:27:51 2006 +*************** +*** 17759,17764 **** +--- 17763,17775 ---- + } + else /* add a new variable */ + { ++ /* Can't add "v:" variable. */ ++ if (ht == &vimvarht) ++ { ++ EMSG2(_(e_illvar), name); ++ return; ++ } ++ + /* Make sure the variable name is valid. */ + for (p = varname; *p != NUL; ++p) + if (!eval_isnamec1(*p) && (p == varname || !VIM_ISDIGIT(*p)) +*** ../vim-7.0.023/src/version.c Thu Jun 22 16:48:43 2006 +--- src/version.c Thu Jun 22 17:30:59 2006 +*************** +*** 668,669 **** +--- 668,671 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 24, + /**/ + +-- +ARTHUR: No, hang on! Just answer the five questions ... +GALAHAD: Three questions ... +ARTHUR: Three questions ... And we shall watch ... and pray. + "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD + + /// 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.025 diff -u /dev/null SOURCES/7.0.025:1.1 --- /dev/null Sun Jun 25 13:01:10 2006 +++ SOURCES/7.0.025 Sun Jun 25 13:01:04 2006 @@ -0,0 +1,80 @@ +To: [email protected] +Subject: Patch 7.0.025 +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.025 +Problem: Crash when removing an element of a:000. (Nikolai Weibull) +Solution: Mark the a:000 list with VAR_FIXED. +Files: src/eval.c + + +*** ../vim-7.0.024/src/eval.c Thu Jun 22 17:33:49 2006 +--- src/eval.c Thu Jun 22 17:56:50 2006 +*************** +*** 13250,13256 **** + if (argvars[2].v_type != VAR_UNKNOWN) + EMSG2(_(e_toomanyarg), "remove()"); + else if ((d = argvars[0].vval.v_dict) != NULL +! && !tv_check_lock(d->dv_lock, (char_u *)"remove()")) + { + key = get_tv_string_chk(&argvars[1]); + if (key != NULL) +--- 13254,13260 ---- + if (argvars[2].v_type != VAR_UNKNOWN) + EMSG2(_(e_toomanyarg), "remove()"); + else if ((d = argvars[0].vval.v_dict) != NULL +! && !tv_check_lock(d->dv_lock, (char_u *)"remove() argument")) + { + key = get_tv_string_chk(&argvars[1]); + if (key != NULL) +*************** +*** 13270,13276 **** + else if (argvars[0].v_type != VAR_LIST) + EMSG2(_(e_listdictarg), "remove()"); + else if ((l = argvars[0].vval.v_list) != NULL +! && !tv_check_lock(l->lv_lock, (char_u *)"remove()")) + { + int error = FALSE; + +--- 13274,13280 ---- + else if (argvars[0].v_type != VAR_LIST) + EMSG2(_(e_listdictarg), "remove()"); + else if ((l = argvars[0].vval.v_list) != NULL +! && !tv_check_lock(l->lv_lock, (char_u *)"remove() argument")) + { + int error = FALSE; + +*************** +*** 19693,19698 **** +--- 19697,19703 ---- + v->di_tv.vval.v_list = &fc.l_varlist; + vim_memset(&fc.l_varlist, 0, sizeof(list_T)); + fc.l_varlist.lv_refcount = 99999; ++ fc.l_varlist.lv_lock = VAR_FIXED; + + /* + * Set a:firstline to "firstline" and a:lastline to "lastline". +*** ../vim-7.0.024/src/version.c Thu Jun 22 17:33:49 2006 +--- src/version.c Thu Jun 22 17:59:17 2006 +*************** +*** 668,669 **** +--- 668,671 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 25, + /**/ + +-- +BRIDGEKEEPER: What is your favorite colour? +GAWAIN: Blue ... No yelloooooww! + "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD + + /// 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.026 diff -u /dev/null SOURCES/7.0.026:1.1 --- /dev/null Sun Jun 25 13:01:10 2006 +++ SOURCES/7.0.026 Sun Jun 25 13:01:04 2006 @@ -0,0 +1,60 @@ +To: [email protected] +Subject: Patch 7.0.026 +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.026 +Problem: Using libcall() may show an old error. +Solution: Invoke dlerror() to clear a previous error. (Yukihiro Nakadaira) +Files: src/os_unix.c + + +*** ../vim-7.0.025/src/os_unix.c Wed May 3 00:01:30 2006 +--- src/os_unix.c Sat Jun 17 21:00:14 2006 +*************** +*** 5757,5764 **** + int retval_int = 0; + int success = FALSE; + +! /* Get a handle to the DLL module. */ + # if defined(USE_DLOPEN) + hinstLib = dlopen((char *)libname, RTLD_LAZY + # ifdef RTLD_LOCAL + | RTLD_LOCAL +--- 5758,5770 ---- + int retval_int = 0; + int success = FALSE; + +! /* +! * Get a handle to the DLL module. +! */ + # if defined(USE_DLOPEN) ++ /* First clear any error, it's not cleared by the dlopen() call. */ ++ (void)dlerror(); ++ + hinstLib = dlopen((char *)libname, RTLD_LAZY + # ifdef RTLD_LOCAL + | RTLD_LOCAL +*** ../vim-7.0.025/src/version.c Thu Jun 22 18:02:06 2006 +--- src/version.c Thu Jun 22 18:05:10 2006 +*************** +*** 668,669 **** +--- 668,671 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 26, + /**/ + +-- +BRIDGEKEEPER: What is your favorite editor? +GAWAIN: Emacs ... No, Viiiiiiiiiiimmmmmmm! + "Monty Python and the Holy editor wars" PYTHON (MONTY) SOFTWARE LTD + + /// 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.029 diff -u /dev/null SOURCES/7.0.029:1.1 --- /dev/null Sun Jun 25 13:01:10 2006 +++ SOURCES/7.0.029 Sun Jun 25 13:01:04 2006 @@ -0,0 +1,48 @@ +To: [email protected] +Subject: Patch 7.0.029 +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.029 +Problem: getchar() may not position the cursor after a space. +Solution: Position the cursor explicitly. +Files: src/eval.c + + +*** ../vim-7.0.028/src/eval.c Thu Jun 22 18:02:06 2006 +--- src/eval.c Thu Jun 22 21:00:00 2006 +*************** +*** 9792,9797 **** +--- 9792,9800 ---- + varnumber_T n; + int error = FALSE; + ++ /* Position the cursor. Needed after a message that ends in a space. */ ++ windgoto(msg_row, msg_col); ++ + ++no_mapping; + ++allow_keys; + if (argvars[0].v_type == VAR_UNKNOWN) +*** ../vim-7.0.028/src/version.c Thu Jun 22 19:47:11 2006 +--- src/version.c Thu Jun 22 20:55:43 2006 +*************** +*** 668,669 **** +--- 668,671 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 29, + /**/ + +-- +BEDEVERE: How do you know so much about swallows? +ARTHUR: Well you have to know these things when you're a king, you know. + "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD + + /// 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.030 diff -u /dev/null SOURCES/7.0.030:1.1 --- /dev/null Sun Jun 25 13:01:10 2006 +++ SOURCES/7.0.030 Sun Jun 25 13:01:04 2006 @@ -0,0 +1,52 @@ +To: [email protected] +Subject: Patch 7.0.030 +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.030 +Problem: The ":compiler" command can't be used in a FileChangedRO event. + (Hari Krishna Dara) +Solution: Add the CMDWIN flag to the ":compiler" command. +Files: src/ex_cmds.h + + +*** ../vim-7.0.029/src/ex_cmds.h Fri Apr 7 23:40:07 2006 +--- src/ex_cmds.h Sun Jun 18 22:44:01 2006 +*************** +*** 262,268 **** + EX(CMD_comclear, "comclear", ex_comclear, + TRLBAR|CMDWIN), + EX(CMD_compiler, "compiler", ex_compiler, +! BANG|TRLBAR|WORD1), + EX(CMD_continue, "continue", ex_continue, + TRLBAR|SBOXOK|CMDWIN), + EX(CMD_confirm, "confirm", ex_wrongmodifier, +--- 262,268 ---- + EX(CMD_comclear, "comclear", ex_comclear, + TRLBAR|CMDWIN), + EX(CMD_compiler, "compiler", ex_compiler, +! BANG|TRLBAR|WORD1|CMDWIN), + EX(CMD_continue, "continue", ex_continue, + TRLBAR|SBOXOK|CMDWIN), + EX(CMD_confirm, "confirm", ex_wrongmodifier, +*** ../vim-7.0.029/src/version.c Thu Jun 22 21:01:19 2006 +--- src/version.c Thu Jun 22 21:08:12 2006 +*************** +*** 668,669 **** +--- 668,671 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 30, + /**/ + +-- +Every person is responsible for the choices he makes. + + /// 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.031 diff -u /dev/null SOURCES/7.0.031:1.1 --- /dev/null Sun Jun 25 13:01:10 2006 +++ SOURCES/7.0.031 Sun Jun 25 13:01:04 2006 @@ -0,0 +1,58 @@ +To: [email protected] +Subject: Patch 7.0.031 +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.031 +Problem: When deleting a buffer the buffer-local mappings for Select mode + remain. +Solution: Add the Select mode bit to MAP_ALL_MODES. (Edwin Steiner) +Files: src/vim.h + + +*** ../vim-7.0.030/src/vim.h Thu Jun 22 19:47:11 2006 +--- src/vim.h Fri Jun 23 16:29:03 2006 +*************** +*** 585,591 **** + #define INSERT 0x10 /* Insert mode */ + #define LANGMAP 0x20 /* Language mapping, can be combined with + INSERT and CMDLINE */ +- #define MAP_ALL_MODES 0x3f /* all mode bits used for mapping */ + + #define REPLACE_FLAG 0x40 /* Replace mode flag */ + #define REPLACE (REPLACE_FLAG + INSERT) +--- 585,590 ---- +*************** +*** 604,609 **** +--- 603,611 ---- + #define SHOWMATCH (0x700 + INSERT) /* show matching paren */ + #define CONFIRM 0x800 /* ":confirm" prompt */ + #define SELECTMODE 0x1000 /* Select mode, only for mappings */ ++ ++ #define MAP_ALL_MODES (0x3f | SELECTMODE) /* all mode bits used for ++ * mapping */ + + /* directions */ + #define FORWARD 1 +*** ../vim-7.0.030/src/version.c Thu Jun 22 21:15:46 2006 +--- src/version.c Fri Jun 23 16:33:25 2006 +*************** +*** 668,669 **** +--- 668,671 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 31, + /**/ + +-- +Why don't cannibals eat clowns? +Because they taste funny. + + /// 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.033 diff -u /dev/null SOURCES/7.0.033:1.1 --- /dev/null Sun Jun 25 13:01:10 2006 +++ SOURCES/7.0.033 Sun Jun 25 13:01:04 2006 @@ -0,0 +1,69 @@ +To: [email protected] +Subject: Patch 7.0.033 +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.033 +Problem: When pasting text, with the menu or CTRL-V, autoindent is removed. +Solution: Use "x<BS>" to avoid indent to be removed. (Benji Fisher) +Files: runtime/autoload/paste.vim + + +*** ../vim-7.0.032/runtime/autoload/paste.vim Fri Apr 21 23:57:39 2006 +--- runtime/autoload/paste.vim Fri Jun 23 17:18:48 2006 +*************** +*** 1,6 **** + " Vim support file to help with paste mappings and menus + " Maintainer: Bram Moolenaar <[EMAIL PROTECTED]> +! " Last Change: 2006 Apr 21 + + " Define the string to use for items that are present both in Edit, Popup and + " Toolbar menu. Also used in mswin.vim and macmap.vim. +--- 1,6 ---- + " Vim support file to help with paste mappings and menus + " Maintainer: Bram Moolenaar <[EMAIL PROTECTED]> <<Diff was trimmed, longer than 597 lines>> _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
