From 43459aecd8c9f96013cab3092f9fd23d8ccb0528 Mon Sep 17 00:00:00 2001 From: Karsten Hopp Date: Mar 27 2009 11:39:00 +0000 Subject: - patchlevel 148 --- diff --git a/7.2.148 b/7.2.148 new file mode 100644 index 0000000..3250499 --- /dev/null +++ b/7.2.148 @@ -0,0 +1,145 @@ +To: vim-dev@vim.org +Subject: Patch 7.2.148 +Fcc: outbox +From: Bram Moolenaar +Mime-Version: 1.0 +Content-Type: text/plain; charset=ISO-8859-1 +Content-Transfer-Encoding: 8bit +------------ + +Patch 7.2.148 +Problem: When searching for "$" while 'hlsearch' is set, highlighting the + character after the line does not work in the cursor column. + Also highlighting for Visual mode after the line end when this + isn't needed. (Markus Heidelberg) +Solution: Only compare the cursor column in the cursor line. Only highlight + for Visual selection after the last character when it's needed to + see where the Visual selection ends. +Files: src/screen.c + + +*** ../vim-7.2.147/src/screen.c Wed Mar 18 16:26:31 2009 +--- src/screen.c Wed Mar 18 17:24:56 2009 +*************** +*** 2889,2896 **** + } + else + tocol = MAXCOL; +! if (fromcol == tocol) /* do at least one character */ +! tocol = fromcol + 1; /* happens when past end of line */ + area_highlighting = TRUE; + attr = hl_attr(HLF_I); + } +--- 2889,2897 ---- + } + else + tocol = MAXCOL; +! /* do at least one character; happens when past end of line */ +! if (fromcol == tocol) +! tocol = fromcol + 1; + area_highlighting = TRUE; + attr = hl_attr(HLF_I); + } +*************** +*** 4118,4123 **** +--- 4119,4125 ---- + # endif + (col < W_WIDTH(wp))) + && !(noinvcur ++ && lnum == wp->w_cursor.lnum + && (colnr_T)vcol == wp->w_virtcol))) + && lcs_eol_one >= 0) + { +*************** +*** 4259,4265 **** + * preedit_changed and commit. Thus Vim can't set "im_is_active", use + * im_is_preediting() here. */ + if (xic != NULL +! && lnum == curwin->w_cursor.lnum + && (State & INSERT) + && !p_imdisable + && im_is_preediting() +--- 4261,4267 ---- + * preedit_changed and commit. Thus Vim can't set "im_is_active", use + * im_is_preediting() here. */ + if (xic != NULL +! && lnum == wp->w_cursor.lnum + && (State & INSERT) + && !p_imdisable + && im_is_preediting() +*************** +*** 4268,4274 **** + colnr_T tcol; + + if (preedit_end_col == MAXCOL) +! getvcol(curwin, &(curwin->w_cursor), &tcol, NULL, NULL); + else + tcol = preedit_end_col; + if ((long)preedit_start_col <= vcol && vcol < (long)tcol) +--- 4270,4276 ---- + colnr_T tcol; + + if (preedit_end_col == MAXCOL) +! getvcol(curwin, &(wp->w_cursor), &tcol, NULL, NULL); + else + tcol = preedit_end_col; + if ((long)preedit_start_col <= vcol && vcol < (long)tcol) +*************** +*** 4365,4371 **** + } + #endif + if (lcs_eol == lcs_eol_one +! && ((area_attr != 0 && vcol == fromcol && c == NUL) + #ifdef FEAT_SEARCH_EXTRA + /* highlight 'hlsearch' match at end of line */ + || (prevcol_hl_flag == TRUE +--- 4367,4379 ---- + } + #endif + if (lcs_eol == lcs_eol_one +! && ((area_attr != 0 && vcol == fromcol +! #ifdef FEAT_VISUAL +! && (VIsual_mode != Ctrl_V +! || lnum == VIsual.lnum +! || lnum == curwin->w_cursor.lnum) +! #endif +! && c == NUL) + #ifdef FEAT_SEARCH_EXTRA + /* highlight 'hlsearch' match at end of line */ + || (prevcol_hl_flag == TRUE +*************** +*** 4459,4465 **** + if (c == NUL) + { + #ifdef FEAT_SYN_HL +! if (eol_hl_off > 0 && vcol - eol_hl_off == (long)wp->w_virtcol) + { + /* highlight last char after line */ + --col; +--- 4467,4474 ---- + if (c == NUL) + { + #ifdef FEAT_SYN_HL +! if (eol_hl_off > 0 && vcol - eol_hl_off == (long)wp->w_virtcol +! && lnum == wp->w_cursor.lnum) + { + /* highlight last char after line */ + --col; +*** ../vim-7.2.147/src/version.c Wed Mar 18 16:26:31 2009 +--- src/version.c Wed Mar 18 19:05:37 2009 +*************** +*** 678,679 **** +--- 678,681 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 148, + /**/ + +-- +hundred-and-one symptoms of being an internet addict: +239. You think "surfing" is something you do on dry land. + + /// Bram Moolenaar -- Bram@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 /// diff --git a/README.patches b/README.patches index a21cee5..c7e422a 100644 --- a/README.patches +++ b/README.patches @@ -160,4 +160,20 @@ Individual patches for Vim 7.2: 2229 7.2.129 opening command window from input() uses the search history 12852 7.2.130 Vim may haing until CTRL-C is typed when using CTRL-Z 2612 7.2.131 using wrong cursor highlighting after clearing 'keymap' - 7823 7.2.132 may access freed memory when changing dir in SwapExists autocmd + 7823 7.2.132 accessing freed memory when changing dir in SwapExists autocmd + 1665 7.2.133 ":diffoff!" changes settings in windows not in diff mode + 2314 7.2.134 compiler warnings for discarding "const" from pointer + 1991 7.2.135 memory leak when redefining user command with complete arg + 1326 7.2.136 (after 7.2.132) ":cd" still possible in SwapExists autocmd + 11328 7.2.137 wrong left shift of blockwise selection in tab when 've' set + 5428 7.2.138 extra part of 7.2.137 + 2229 7.2.139 crash when 'virtualedit' is "all" + 1974 7.2.140 diff highlighting missing if Visual area starts at cursor pos + 6622 7.2.141 fixing bold spill redraws too many characters + 1753 7.2.142 Motif and Athena balloons don't use tooltip colors + 6830 7.2.143 no command line completion for ":cscope" command + 2304 7.2.144 colorscheme is reloaded when 't_Co' is set to the same value + 3379 7.2.145 white space in ":cscope find" is not ignored + 3394 7.2.146 v:warningmsg isn't used for all warnings + 1548 7.2.147 cursor in wrong position after Tab for small version + 4275 7.2.148 highlighting a character after the line doesn't always work diff --git a/vim.spec b/vim.spec index 18a4e2e..36e4500 100644 --- a/vim.spec +++ b/vim.spec @@ -18,7 +18,7 @@ #used for pre-releases: %define beta %{nil} %define vimdir vim72%{?beta} -%define patchlevel 132 +%define patchlevel 148 Summary: The VIM editor URL: http://www.vim.org/ @@ -198,6 +198,22 @@ Patch129: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.129 Patch130: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.130 Patch131: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.131 Patch132: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.132 +Patch133: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.133 +Patch134: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.134 +Patch135: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.135 +Patch136: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.136 +Patch137: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.137 +Patch138: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.138 +Patch139: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.139 +Patch140: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.140 +Patch141: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.141 +Patch142: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.142 +Patch143: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.143 +Patch144: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.144 +Patch145: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.145 +Patch146: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.146 +Patch147: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.147 +Patch148: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.148 Patch3000: vim-7.0-syntax.patch Patch3002: vim-7.1-nowarnings.patch @@ -419,7 +435,7 @@ perl -pi -e "s,bin/nawk,bin/awk,g" runtime/tools/mve.awk %patch086 -p0 %patch087 -p0 %patch088 -p0 -%patch089 -p0 +%patch089 -p0 %patch090 -p0 %patch091 -p0 %patch092 -p0 @@ -463,6 +479,23 @@ perl -pi -e "s,bin/nawk,bin/awk,g" runtime/tools/mve.awk %patch130 -p0 %patch131 -p0 %patch132 -p0 +%patch133 -p0 +%patch134 -p0 +%patch135 -p0 +%patch136 -p0 +%patch137 -p0 +%patch138 -p0 +%patch139 -p0 +%patch140 -p0 +%patch141 -p0 +%patch142 -p0 +%patch143 -p0 +%patch144 -p0 +%patch145 -p0 +%patch146 -p0 +%patch147 -p0 +%patch148 -p0 + # install spell files %if %{withvimspell} @@ -921,6 +954,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/icons/hicolor/*/apps/* %changelog +* Fri Mar 27 2009 Karsten Hopp 7.2.148-1 +- patchlevel 148, fixes #461417 + * Tue Mar 10 2009 Karsten Hopp 7.2.132-1 - patchlevel 132, fixes accesses to freed memory