From 5ee5dc07d86381a48e7781c4e9feb3fcde399ad3 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Arkadiusz=20Mi=C5=9Bkiewicz?= Date: Sat, 13 May 2006 16:45:40 +0000 Subject: [PATCH] - these need to be in cvs Changed files: 7.0.001 -> 1.1 7.0.002 -> 1.1 7.0.003 -> 1.1 7.0.004 -> 1.1 7.0.006 -> 1.1 7.0.007 -> 1.1 7.0.008 -> 1.1 7.0.009 -> 1.1 7.0.010 -> 1.1 7.0.011 -> 1.1 7.0.012 -> 1.1 7.0.013 -> 1.1 7.0.014 -> 1.1 7.0.015 -> 1.1 7.0.016 -> 1.1 7.0.017 -> 1.1 --- 7.0.001 | 52 +++++++++++++++ 7.0.002 | 70 +++++++++++++++++++ 7.0.003 | 62 +++++++++++++++++ 7.0.004 | 52 +++++++++++++++ 7.0.006 | 46 +++++++++++++ 7.0.007 | 68 +++++++++++++++++++ 7.0.008 | 74 ++++++++++++++++++++ 7.0.009 | 54 +++++++++++++++ 7.0.010 | 118 ++++++++++++++++++++++++++++++++ 7.0.011 | 65 ++++++++++++++++++ 7.0.012 | 84 +++++++++++++++++++++++ 7.0.013 | 154 ++++++++++++++++++++++++++++++++++++++++++ 7.0.014 | 189 +++++++++++++++++++++++++++++++++++++++++++++++++++ 7.0.015 | 204 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 7.0.016 | 67 +++++++++++++++++++ 7.0.017 | 64 ++++++++++++++++++ 16 files changed, 1423 insertions(+) create mode 100644 7.0.001 create mode 100644 7.0.002 create mode 100644 7.0.003 create mode 100644 7.0.004 create mode 100644 7.0.006 create mode 100644 7.0.007 create mode 100644 7.0.008 create mode 100644 7.0.009 create mode 100644 7.0.010 create mode 100644 7.0.011 create mode 100644 7.0.012 create mode 100644 7.0.013 create mode 100644 7.0.014 create mode 100644 7.0.015 create mode 100644 7.0.016 create mode 100644 7.0.017 diff --git a/7.0.001 b/7.0.001 new file mode 100644 index 0000000..535e8de --- /dev/null +++ b/7.0.001 @@ -0,0 +1,52 @@ +To: vim-dev@vim.org +Subject: Patch 7.0.001 +Fcc: outbox +From: Bram Moolenaar +Mime-Version: 1.0 +Content-Type: text/plain; charset=ISO-8859-1 +Content-Transfer-Encoding: 8bit +------------ + +Patch 7.0.001 +Problem: ":set spellsuggest+=10" does not work. (Suresh Govindachar) +Solution: Add P_COMMA to the 'spellsuggest' flags. +Files: src/option.c + + +*** ../vim-7.0.000/src/option.c Wed May 3 23:26:04 2006 +--- src/option.c Sun May 7 17:54:46 2006 +*************** +*** 2294,2300 **** + {(char_u *)0L, (char_u *)0L} + #endif + }, +! {"spellsuggest", "sps", P_STRING|P_VI_DEF|P_EXPAND|P_SECURE, + #ifdef FEAT_SPELL + (char_u *)&p_sps, PV_NONE, + {(char_u *)"best", (char_u *)0L} +--- 2294,2300 ---- + {(char_u *)0L, (char_u *)0L} + #endif + }, +! {"spellsuggest", "sps", P_STRING|P_VI_DEF|P_EXPAND|P_SECURE|P_COMMA, + #ifdef FEAT_SPELL + (char_u *)&p_sps, PV_NONE, + {(char_u *)"best", (char_u *)0L} +*** ../vim-7.0.000/src/version.c Wed May 3 00:04:24 2006 +--- src/version.c Tue May 9 14:23:20 2006 +*************** +*** 668,669 **** +--- 668,671 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 1, + /**/ + +-- +hundred-and-one symptoms of being an internet addict: +70. ISDN lines are added to your house on a hourly basis + + /// 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/7.0.002 b/7.0.002 new file mode 100644 index 0000000..af9e8db --- /dev/null +++ b/7.0.002 @@ -0,0 +1,70 @@ +To: vim-dev@vim.org +Subject: Patch 7.0.002 +Fcc: outbox +From: Bram Moolenaar +Mime-Version: 1.0 +Content-Type: text/plain; charset=ISO-8859-1 +Content-Transfer-Encoding: 8bit +------------ + +Patch 7.0.002 +Problem: C omni completion has a problem with tags files with a path + containing "#" or "%". +Solution: Escape these characters. (Sebastian Baberowski) +Files: runtime/autoload/ccomplete.vim + + +*** ../vim-7.0.001/runtime/autoload/ccomplete.vim Wed May 10 15:22:54 2006 +--- runtime/autoload/ccomplete.vim Mon May 8 13:52:07 2006 +*************** +*** 1,7 **** + " Vim completion script + " Language: C + " Maintainer: Bram Moolenaar +! " Last Change: 2006 May 03 + + + " This function is used for the 'omnifunc' option. +--- 1,7 ---- + " Vim completion script + " Language: C + " Maintainer: Bram Moolenaar +! " Last Change: 2006 May 08 + + + " This function is used for the 'omnifunc' option. +*************** +*** 458,464 **** + " member. + function! s:StructMembers(typename, items, all) + " Todo: What about local structures? +! let fnames = join(map(tagfiles(), 'escape(v:val, " \\")')) + if fnames == '' + return [] + endif +--- 458,464 ---- + " member. + function! s:StructMembers(typename, items, all) + " Todo: What about local structures? +! let fnames = join(map(tagfiles(), 'escape(v:val, " \\#%")')) + if fnames == '' + return [] + endif +*** ../vim-7.0.001/src/version.c Wed May 10 15:22:50 2006 +--- src/version.c Wed May 10 15:24:42 2006 +*************** +*** 668,669 **** +--- 668,671 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 2, + /**/ + +-- +From "know your smileys": + =):-) Uncle Sam + + /// 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/7.0.003 b/7.0.003 new file mode 100644 index 0000000..228bfea --- /dev/null +++ b/7.0.003 @@ -0,0 +1,62 @@ +To: vim-dev@vim.org +Subject: Patch 7.0.003 +Fcc: outbox +From: Bram Moolenaar +Mime-Version: 1.0 +Content-Type: text/plain; charset=ISO-8859-1 +Content-Transfer-Encoding: 8bit +------------ + +Patch 7.0.003 +Problem: GUI: clicking in the lower part of a label in the tab pages line + while 'mousefocus' is set may warp the mouse pointer. (Robert + Webb) +Solution: Check for a negative mouse position. +Files: src/gui.c + + +*** ../vim-7.0.002/src/gui.c Wed May 10 15:22:49 2006 +--- src/gui.c Mon May 8 16:31:49 2006 +*************** +*** 4603,4613 **** + /* Don't move the mouse when it's left or right of the Vim window */ + if (x < 0 || x > Columns * gui.char_width) + return; + # ifdef FEAT_WINDOWS +! if (Y_2_ROW(y) >= tabline_height()) +! # else +! if (y >= 0) + # endif + wp = xy2win(x, y); + if (wp != curwin && wp != NULL) /* If in other than current window */ + { +--- 4603,4613 ---- + /* Don't move the mouse when it's left or right of the Vim window */ + if (x < 0 || x > Columns * gui.char_width) + return; ++ if (y >= 0 + # ifdef FEAT_WINDOWS +! && Y_2_ROW(y) >= tabline_height() + # endif ++ ) + wp = xy2win(x, y); + if (wp != curwin && wp != NULL) /* If in other than current window */ + { +*** ../vim-7.0.002/src/version.c Wed May 10 15:25:45 2006 +--- src/version.c Wed May 10 17:12:27 2006 +*************** +*** 668,669 **** +--- 668,671 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 3, + /**/ + +-- +From "know your smileys": + 2B|^2B Message from Shakespeare + + /// 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/7.0.004 b/7.0.004 new file mode 100644 index 0000000..e6e80c8 --- /dev/null +++ b/7.0.004 @@ -0,0 +1,52 @@ +To: vim-dev@vim.org +Subject: Patch 7.0.004 +Fcc: outbox +From: Bram Moolenaar +Mime-Version: 1.0 +Content-Type: text/plain; charset=ISO-8859-1 +Content-Transfer-Encoding: 8bit +------------ + +Patch 7.0.004 +Problem: Compiler warning for debug_saved used before set. (Todd Blumer) +Solution: Remove the "else" for calling save_dbg_stuff(). +Files: src/ex_docmd.c + + +*** ../vim-7.0.003/src/ex_docmd.c Wed May 10 15:22:49 2006 +--- src/ex_docmd.c Mon May 8 16:43:34 2006 +*************** +*** 833,839 **** + * If requested, store and reset the global values controlling the + * exception handling (used when debugging). + */ +! else if (flags & DOCMD_EXCRESET) + save_dbg_stuff(&debug_saved); + + initial_trylevel = trylevel; +--- 833,839 ---- + * If requested, store and reset the global values controlling the + * exception handling (used when debugging). + */ +! if (flags & DOCMD_EXCRESET) + save_dbg_stuff(&debug_saved); + + initial_trylevel = trylevel; +*** ../vim-7.0.003/src/version.c Wed May 10 17:12:51 2006 +--- src/version.c Wed May 10 17:14:34 2006 +*************** +*** 668,669 **** +--- 668,671 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 4, + /**/ + +-- +From "know your smileys": + :-D Big smile + + /// 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/7.0.006 b/7.0.006 new file mode 100644 index 0000000..dca5e35 --- /dev/null +++ b/7.0.006 @@ -0,0 +1,46 @@ +To: vim-dev@vim.org +Subject: Patch 7.0.006 +Fcc: outbox +From: Bram Moolenaar +Mime-Version: 1.0 +Content-Type: text/plain; charset=ISO-8859-1 +Content-Transfer-Encoding: 8bit +------------ + +Patch 7.0.006 +Problem: Mac: "make shadow" doesn't make a link for infplist.xml. (Axel + Kielhorn) +Solution: Make the link. +Files: src/Makefile + + +*** ../vim-7.0.005/src/Makefile Wed May 10 15:22:49 2006 +--- src/Makefile Wed May 10 17:26:19 2006 +*************** +*** 2177,2182 **** +--- 2177,2183 ---- + cd $(SHADOWDIR)/xxd; ln -s ../../xxd/*.[ch] ../../xxd/Make* . + if test -d $(RSRC_DIR); then \ + cd $(SHADOWDIR); \ ++ ln -s ../infplist.xml .; \ + ln -s ../$(RSRC_DIR) ../os_mac.rsr.hqx ../dehqx.py .; \ + fi + mkdir $(SHADOWDIR)/testdir +*** ../vim-7.0.005/src/version.c Wed May 10 17:24:26 2006 +--- src/version.c Wed May 10 17:26:09 2006 +*************** +*** 668,669 **** +--- 668,671 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 6, + /**/ + +-- +From "know your smileys": + @:-() Elvis Presley + + /// 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/7.0.007 b/7.0.007 new file mode 100644 index 0000000..e25742b --- /dev/null +++ b/7.0.007 @@ -0,0 +1,68 @@ +To: vim-dev@vim.org +Subject: Patch 7.0.007 +Fcc: outbox +From: Bram Moolenaar +Mime-Version: 1.0 +Content-Type: text/plain; charset=ISO-8859-1 +Content-Transfer-Encoding: 8bit +------------ + +Patch 7.0.007 +Problem: AIX: compiling fails for message.c. (Ruediger Hornig) +Solution: Move the #if outside of memchr(). +Files: src/message.c + + +*** ../vim-7.0.006/src/message.c Wed May 10 15:22:50 2006 +--- src/message.c Tue May 9 10:36:56 2006 +*************** +*** 4175,4189 **** + str_arg_l = 0; + else + { +! /* memchr on HP does not like n > 2^31 !!! */ +! char *q = memchr(str_arg, '\0', + #if SIZEOF_INT <= 2 +! precision + #else +! precision <= (size_t)0x7fffffffL ? precision +! : (size_t)0x7fffffffL + #endif +- ); + str_arg_l = (q == NULL) ? precision : q - str_arg; + } + break; +--- 4175,4190 ---- + str_arg_l = 0; + else + { +! /* Don't put the #if inside memchr(), it can be a +! * macro. */ + #if SIZEOF_INT <= 2 +! char *q = memchr(str_arg, '\0', precision); + #else +! /* memchr on HP does not like n > 2^31 !!! */ +! char *q = memchr(str_arg, '\0', +! precision <= (size_t)0x7fffffffL ? precision +! : (size_t)0x7fffffffL); + #endif + str_arg_l = (q == NULL) ? precision : q - str_arg; + } + break; +*** ../vim-7.0.006/src/version.c Wed May 10 17:26:37 2006 +--- src/version.c Wed May 10 17:36:03 2006 +*************** +*** 668,669 **** +--- 668,671 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 7, + /**/ + +-- +Momento mori, ergo carpe diem + + /// 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/7.0.008 b/7.0.008 new file mode 100644 index 0000000..2718548 --- /dev/null +++ b/7.0.008 @@ -0,0 +1,74 @@ +To: vim-dev@vim.org +Subject: Patch 7.0.008 +Fcc: outbox +From: Bram Moolenaar +Mime-Version: 1.0 +Content-Type: text/plain; charset=ISO-8859-1 +Content-Transfer-Encoding: 8bit +------------ + +Patch 7.0.008 +Problem: Can't call a function that uses both and {expr}. (Thomas) +Solution: Check both the expanded and unexpanded name for . +Files: src/eval.c + + +*** ../vim-7.0.007/src/eval.c Wed May 10 15:22:49 2006 +--- src/eval.c Wed May 10 12:11:42 2006 +*************** +*** 11372,11378 **** + if (argvars[2].v_type != VAR_UNKNOWN) + { + char_u *xp_name; +! int xp_namelen; + long argt; + + rettv->vval.v_string = NULL; +--- 11372,11378 ---- + if (argvars[2].v_type != VAR_UNKNOWN) + { + char_u *xp_name; +! int xp_namelen; + long argt; + + rettv->vval.v_string = NULL; +*************** +*** 18963,18969 **** + else if (lead > 0) + { + lead = 3; +! if (eval_fname_sid(lv.ll_exp_name != NULL ? lv.ll_exp_name : *pp)) + { + /* It's "s:" or "" */ + if (current_SID <= 0) +--- 18963,18970 ---- + else if (lead > 0) + { + lead = 3; +! if ((lv.ll_exp_name != NULL && eval_fname_sid(lv.ll_exp_name)) +! || eval_fname_sid(*pp)) + { + /* It's "s:" or "" */ + if (current_SID <= 0) +*** ../vim-7.0.007/src/version.c Wed May 10 17:38:05 2006 +--- src/version.c Wed May 10 17:39:46 2006 +*************** +*** 668,669 **** +--- 668,671 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 8, + /**/ + +-- +From "know your smileys": + % Bike accident. A bit far-fetched, I suppose; although... + o _ _ _ + _o /\_ _ \\o (_)\__/o (_) + _< \_ _>(_) (_)/<_ \_| \ _|/' \/ + (_)>(_) (_) (_) (_) (_)' _\o_ + + /// 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/7.0.009 b/7.0.009 new file mode 100644 index 0000000..4eaf8d0 --- /dev/null +++ b/7.0.009 @@ -0,0 +1,54 @@ +To: vim-dev@vim.org +Subject: Patch 7.0.009 +Fcc: outbox +From: Bram Moolenaar +Mime-Version: 1.0 +Content-Type: text/plain; charset=ISO-8859-1 +Content-Transfer-Encoding: 8bit +------------ + +Patch 7.0.009 +Problem: ml_get errors with both 'sidescroll' and 'spell' set. +Solution: Use ml_get_buf() instead of ml_get(), get the line from the right + buffer, not the current one. +Files: src/spell.c + + +*** ../vim-7.0.008/src/spell.c Wed May 10 15:22:50 2006 +--- src/spell.c Tue May 9 18:55:04 2006 +*************** +*** 2108,2114 **** + * possible. */ + STRCPY(buf, line); + if (lnum < wp->w_buffer->b_ml.ml_line_count) +! spell_cat_line(buf + STRLEN(buf), ml_get(lnum + 1), MAXWLEN); + + p = buf + skip; + endp = buf + len; +--- 2108,2115 ---- + * possible. */ + STRCPY(buf, line); + if (lnum < wp->w_buffer->b_ml.ml_line_count) +! spell_cat_line(buf + STRLEN(buf), +! ml_get_buf(wp->w_buffer, lnum + 1, FALSE), MAXWLEN); + + p = buf + skip; + endp = buf + len; +*** ../vim-7.0.008/src/version.c Wed May 10 17:40:17 2006 +--- src/version.c Wed May 10 17:50:20 2006 +*************** +*** 668,669 **** +--- 668,671 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 9, + /**/ + +-- +I AM THANKFUL... +...for the taxes that I pay because it means that I am employed. + + /// 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/7.0.010 b/7.0.010 new file mode 100644 index 0000000..de1d286 --- /dev/null +++ b/7.0.010 @@ -0,0 +1,118 @@ +To: vim-dev@vim.org +Subject: Patch 7.0.010 +Fcc: outbox +From: Bram Moolenaar +Mime-Version: 1.0 +Content-Type: text/plain; charset=ISO-8859-1 +Content-Transfer-Encoding: 8bit +------------ + +Patch 7.0.010 +Problem: The spellfile plugin required typing login name and password. +Solution: Use "anonymous" and "vim7user" by default. No need to setup a + .netrc file. +Files: runtime/autoload/spellfile.vim + + +*** ../vim-7.0.009/runtime/autoload/spellfile.vim Wed May 10 15:22:54 2006 +--- runtime/autoload/spellfile.vim Wed May 10 17:55:15 2006 +*************** +*** 1,9 **** + " Vim script to download a missing spell file + " Maintainer: Bram Moolenaar +! " Last Change: 2006 Feb 01 + + if !exists('g:spellfile_URL') +! let g:spellfile_URL = 'ftp://ftp.vim.org/pub/vim/unstable/runtime/spell' + endif + let s:spellfile_URL = '' " Start with nothing so that s:donedict is reset. + +--- 1,9 ---- + " Vim script to download a missing spell file + " Maintainer: Bram Moolenaar +! " Last Change: 2006 May 10 + + if !exists('g:spellfile_URL') +! let g:spellfile_URL = 'ftp://ftp.vim.org/pub/vim/runtime/spell' + endif + let s:spellfile_URL = '' " Start with nothing so that s:donedict is reset. + +*************** +*** 61,73 **** + new + setlocal bin + echo 'Downloading ' . fname . '...' +! exe 'Nread ' g:spellfile_URL . '/' . fname + if getline(2) !~ 'VIMspell' + " Didn't work, perhaps there is an ASCII one. + g/^/d + let fname = a:lang . '.ascii.spl' + echo 'Could not find it, trying ' . fname . '...' +! exe 'Nread ' g:spellfile_URL . '/' . fname + if getline(2) !~ 'VIMspell' + echo 'Sorry, downloading failed' + bwipe! +--- 61,73 ---- + new + setlocal bin + echo 'Downloading ' . fname . '...' +! call spellfile#Nread(fname) + if getline(2) !~ 'VIMspell' + " Didn't work, perhaps there is an ASCII one. + g/^/d + let fname = a:lang . '.ascii.spl' + echo 'Could not find it, trying ' . fname . '...' +! call spellfile#Nread(fname) + if getline(2) !~ 'VIMspell' + echo 'Sorry, downloading failed' + bwipe! +*************** +*** 95,101 **** + g/^/d + let fname = substitute(fname, '\.spl$', '.sug', '') + echo 'Downloading ' . fname . '...' +! exe 'Nread ' g:spellfile_URL . '/' . fname + if getline(2) !~ 'VIMsug' + echo 'Sorry, downloading failed' + else +--- 95,101 ---- + g/^/d + let fname = substitute(fname, '\.spl$', '.sug', '') + echo 'Downloading ' . fname . '...' +! call spellfile#Nread(fname) + if getline(2) !~ 'VIMsug' + echo 'Sorry, downloading failed' + else +*************** +*** 108,111 **** +--- 108,118 ---- + + bwipe + endif ++ endfunc ++ ++ " Read "fname" from the ftp server. ++ function! spellfile#Nread(fname) ++ let machine = substitute(g:spellfile_URL, 'ftp://\([^/]*\).*', '\1', '') ++ let dir = substitute(g:spellfile_URL, 'ftp://[^/]*/\(.*\)', '\1', '') ++ exe 'Nread "' . machine . ' anonymous vim7user ' . dir . '/' . a:fname . '"' + endfunc +*** ../vim-7.0.009/src/version.c Wed May 10 17:51:22 2006 +--- src/version.c Wed May 10 17:53:53 2006 +*************** +*** 668,669 **** +--- 668,671 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 10, + /**/ + +-- +I AM THANKFUL... +...for the mess to clean after a party because it means I have +been surrounded by friends. + + /// 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/7.0.011 b/7.0.011 new file mode 100644 index 0000000..a3c65e7 --- /dev/null +++ b/7.0.011 @@ -0,0 +1,65 @@ +To: vim-dev@vim.org +Subject: Patch 7.0.011 +Fcc: outbox +From: Bram Moolenaar +Mime-Version: 1.0 +Content-Type: text/plain; charset=ISO-8859-1 +Content-Transfer-Encoding: 8bit +------------ + +Patch 7.0.011 +Problem: Can't compile without the folding and with the eval feature. +Solution: Add an #ifdef. (Vallimar) +Files: src/option.c + + +*** ../vim-7.0.010/src/option.c Wed May 10 15:22:50 2006 +--- src/option.c Wed May 10 19:37:10 2006 +*************** +*** 5227,5239 **** + case PV_STL: return &curwin->w_p_stl_flags; + #endif + #ifdef FEAT_EVAL + case PV_FDE: return &curwin->w_p_fde_flags; + case PV_FDT: return &curwin->w_p_fdt_flags; + # ifdef FEAT_BEVAL + case PV_BEXPR: return &curbuf->b_p_bexpr_flags; + # endif +- #endif +- #if defined(FEAT_EVAL) + # if defined(FEAT_CINDENT) + case PV_INDE: return &curbuf->b_p_inde_flags; + # endif +--- 5227,5239 ---- + case PV_STL: return &curwin->w_p_stl_flags; + #endif + #ifdef FEAT_EVAL ++ # ifdef FEAT_FOLDING + case PV_FDE: return &curwin->w_p_fde_flags; + case PV_FDT: return &curwin->w_p_fdt_flags; ++ # endif + # ifdef FEAT_BEVAL + case PV_BEXPR: return &curbuf->b_p_bexpr_flags; + # endif + # if defined(FEAT_CINDENT) + case PV_INDE: return &curbuf->b_p_inde_flags; + # endif +*** ../vim-7.0.010/src/version.c Wed May 10 17:55:37 2006 +--- src/version.c Thu May 11 19:22:54 2006 +*************** +*** 668,669 **** +--- 668,671 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 11, + /**/ + +-- +hundred-and-one symptoms of being an internet addict: +112. You are amazed that anyone uses a phone without a modem on it...let + alone hear actual voices. + + /// 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/7.0.012 b/7.0.012 new file mode 100644 index 0000000..573da0c --- /dev/null +++ b/7.0.012 @@ -0,0 +1,84 @@ +To: vim-dev@vim.org +Subject: Patch 7.0.012 +Fcc: outbox +From: Bram Moolenaar +Mime-Version: 1.0 +Content-Type: text/plain; charset=ISO-8859-1 +Content-Transfer-Encoding: 8bit +------------ + +Patch 7.0.012 +Problem: Using the matchparen plugin, moving the cursor in Insert mode to a + shorter line that ends in a brace, changes the preferred column +Solution: Use winsaveview()/winrestview() instead of getpos()/setpos(). +Files: runtime/plugin/matchparen.vim + + +*** ../vim-7.0.011/runtime/plugin/matchparen.vim Wed May 10 15:22:55 2006 +--- runtime/plugin/matchparen.vim Thu May 11 14:42:55 2006 +*************** +*** 1,6 **** + " Vim plugin for showing matching parens + " Maintainer: Bram Moolenaar +! " Last Change: 2006 Apr 27 + + " Exit quickly when: + " - this plugin was already loaded (or disabled) +--- 1,6 ---- + " Vim plugin for showing matching parens + " Maintainer: Bram Moolenaar +! " Last Change: 2006 May 11 + + " Exit quickly when: + " - this plugin was already loaded (or disabled) +*************** +*** 90,96 **** + " Find the match. When it was just before the cursor move it there for a + " moment. + if before > 0 +! let save_cursor = getpos('.') + call cursor(c_lnum, c_col - before) + endif + +--- 90,96 ---- + " Find the match. When it was just before the cursor move it there for a + " moment. + if before > 0 +! let save_cursor = winsaveview() + call cursor(c_lnum, c_col - before) + endif + +*************** +*** 102,108 **** + let [m_lnum, m_col] = searchpairpos(c, '', c2, s_flags, s_skip, stopline) + + if before > 0 +! call setpos('.', save_cursor) + endif + + " If a match is found setup match highlighting. +--- 102,108 ---- + let [m_lnum, m_col] = searchpairpos(c, '', c2, s_flags, s_skip, stopline) + + if before > 0 +! call winrestview(save_cursor) + endif + + " If a match is found setup match highlighting. +*** ../vim-7.0.011/src/version.c Thu May 11 19:24:16 2006 +--- src/version.c Thu May 11 19:29:58 2006 +*************** +*** 668,669 **** +--- 668,671 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 12, + /**/ + +-- +Corduroy pillows: They're making headlines! + + /// 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/7.0.013 b/7.0.013 new file mode 100644 index 0000000..423ea31 --- /dev/null +++ b/7.0.013 @@ -0,0 +1,154 @@ +To: vim-dev@vim.org +Subject: Patch 7.0.013 +Fcc: outbox +From: Bram Moolenaar +Mime-Version: 1.0 +Content-Type: text/plain; charset=ISO-8859-1 +Content-Transfer-Encoding: 8bit +------------ + +Patch 7.0.013 +Problem: Insert mode completion: using CTRL-L to add an extra character + also deselects the current match, making it impossible to use + CTRL-L a second time. +Solution: Keep the current match. Also make CTRL-L work at the original + text, using the first displayed match. +Files: src/edit.c + + +*** ../vim-7.0.012/src/edit.c Wed May 10 15:22:49 2006 +--- src/edit.c Thu May 11 10:38:54 2006 +*************** +*** 751,757 **** + continue; + } + +! /* Pressing CTRL-Y selects the current match. Shen + * compl_enter_selects is set the Enter key does the same. */ + if (c == Ctrl_Y || (compl_enter_selects + && (c == CAR || c == K_KENTER || c == NL))) +--- 751,757 ---- + continue; + } + +! /* Pressing CTRL-Y selects the current match. When + * compl_enter_selects is set the Enter key does the same. */ + if (c == Ctrl_Y || (compl_enter_selects + && (c == CAR || c == K_KENTER || c == NL))) +*************** +*** 3046,3052 **** + ins_compl_delete(); + ins_bytes(compl_leader + curwin->w_cursor.col - compl_col); + compl_used_match = FALSE; +- compl_enter_selects = FALSE; + + if (compl_started) + ins_compl_set_original_text(compl_leader); +--- 3046,3051 ---- +*************** +*** 3076,3081 **** +--- 3075,3081 ---- + compl_restarting = FALSE; + } + ++ #if 0 /* disabled, made CTRL-L, BS and typing char jump to original text. */ + if (!compl_used_match) + { + /* Go to the original text, since none of the matches is inserted. */ +*************** +*** 3087,3092 **** +--- 3087,3094 ---- + compl_curr_match = compl_shown_match; + compl_shows_dir = compl_direction; + } ++ #endif ++ compl_enter_selects = !compl_used_match; + + /* Show the popup menu with a different set of matches. */ + ins_compl_show_pum(); +*************** +*** 3175,3184 **** + char_u *p; + int len = curwin->w_cursor.col - compl_col; + int c; + + p = compl_shown_match->cp_str; + if ((int)STRLEN(p) <= len) /* the match is too short */ +! return; + p += len; + #ifdef FEAT_MBYTE + c = mb_ptr2char(p); +--- 3177,3208 ---- + char_u *p; + int len = curwin->w_cursor.col - compl_col; + int c; ++ compl_T *cp; + + p = compl_shown_match->cp_str; + if ((int)STRLEN(p) <= len) /* the match is too short */ +! { +! /* When still at the original match use the first entry that matches +! * the leader. */ +! if (compl_shown_match->cp_flags & ORIGINAL_TEXT) +! { +! p = NULL; +! for (cp = compl_shown_match->cp_next; cp != NULL +! && cp != compl_first_match; cp = cp->cp_next) +! { +! if (ins_compl_equal(cp, compl_leader, +! (int)STRLEN(compl_leader))) +! { +! p = cp->cp_str; +! break; +! } +! } +! if (p == NULL || (int)STRLEN(p) <= len) +! return; +! } +! else +! return; +! } + p += len; + #ifdef FEAT_MBYTE + c = mb_ptr2char(p); +*************** +*** 4100,4105 **** +--- 4124,4144 ---- + && compl_shown_match->cp_next != NULL + && compl_shown_match->cp_next != compl_first_match) + compl_shown_match = compl_shown_match->cp_next; ++ ++ /* If we didn't find it searching forward, and compl_shows_dir is ++ * backward, find the last match. */ ++ if (compl_shows_dir == BACKWARD ++ && !ins_compl_equal(compl_shown_match, ++ compl_leader, (int)STRLEN(compl_leader)) ++ && (compl_shown_match->cp_next == NULL ++ || compl_shown_match->cp_next == compl_first_match)) ++ { ++ while (!ins_compl_equal(compl_shown_match, ++ compl_leader, (int)STRLEN(compl_leader)) ++ && compl_shown_match->cp_prev != NULL ++ && compl_shown_match->cp_prev != compl_first_match) ++ compl_shown_match = compl_shown_match->cp_prev; ++ } + } + + if (allow_get_expansion && insert_match +*** ../vim-7.0.012/src/version.c Thu May 11 19:30:09 2006 +--- src/version.c Fri May 12 19:03:32 2006 +*************** +*** 668,669 **** +--- 668,671 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 13, + /**/ + +-- +I'm writing a book. I've got the page numbers done. + + /// 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/7.0.014 b/7.0.014 new file mode 100644 index 0000000..b6d927d --- /dev/null +++ b/7.0.014 @@ -0,0 +1,189 @@ +To: vim-dev@vim.org +Subject: Patch 7.0.014 +Fcc: outbox +From: Bram Moolenaar +Mime-Version: 1.0 +Content-Type: text/plain; charset=ISO-8859-1 +Content-Transfer-Encoding: 8bit +------------ + +Patch 7.0.014 +Problem: Compiling gui_xmebw.c fails on Dec Alpha Tru64. (Rolfe) +Solution: Disable some code for Motif 1.2 and older. +Files: src/gui_xmebw.c + + +*** ../vim-7.0.013/src/gui_xmebw.c Wed May 10 15:22:49 2006 +--- src/gui_xmebw.c Thu May 11 19:09:32 2006 +*************** +*** 480,486 **** + || (eb->core.height <= 2 * eb->primitive.highlight_thickness)) + return; + +! #ifndef LESSTIF_VERSION + { + XmDisplay dpy; + +--- 480,486 ---- + || (eb->core.height <= 2 * eb->primitive.highlight_thickness)) + return; + +! #if !defined(LESSTIF_VERSION) && (XmVersion > 1002) + { + XmDisplay dpy; + +*************** +*** 641,647 **** + GC tmp_gc = NULL; + Boolean replaceGC = False; + Boolean deadjusted = False; +! #ifndef LESSTIF_VERSION + XmDisplay dpy = (XmDisplay)XmGetXmDisplay(XtDisplay(eb)); + Boolean etched_in = dpy->display.enable_etched_in_menu; + #else +--- 641,647 ---- + GC tmp_gc = NULL; + Boolean replaceGC = False; + Boolean deadjusted = False; +! #if !defined(LESSTIF_VERSION) && (XmVersion > 1002) + XmDisplay dpy = (XmDisplay)XmGetXmDisplay(XtDisplay(eb)); + Boolean etched_in = dpy->display.enable_etched_in_menu; + #else +*************** +*** 726,732 **** + if ((((ShellWidget) XtParent(XtParent(eb)))->shell.popped_up) + && _XmGetInDragMode((Widget) eb)) + { +! #ifndef LESSTIF_VERSION + XmDisplay dpy = (XmDisplay) XmGetXmDisplay(XtDisplay(wid)); + Boolean etched_in = dpy->display.enable_etched_in_menu; + #else +--- 726,732 ---- + if ((((ShellWidget) XtParent(XtParent(eb)))->shell.popped_up) + && _XmGetInDragMode((Widget) eb)) + { +! #if !defined(LESSTIF_VERSION) && (XmVersion > 1002) + XmDisplay dpy = (XmDisplay) XmGetXmDisplay(XtDisplay(wid)); + Boolean etched_in = dpy->display.enable_etched_in_menu; + #else +*************** +*** 810,816 **** + + if (Lab_IsMenupane(eb)) + { +! #ifndef LESSTIF_VERSION + XmDisplay dpy = (XmDisplay) XmGetXmDisplay(XtDisplay(wid)); + Boolean etched_in = dpy->display.enable_etched_in_menu; + #else +--- 810,816 ---- + + if (Lab_IsMenupane(eb)) + { +! #if !defined(LESSTIF_VERSION) && (XmVersion > 1002) + XmDisplay dpy = (XmDisplay) XmGetXmDisplay(XtDisplay(wid)); + Boolean etched_in = dpy->display.enable_etched_in_menu; + #else +*************** +*** 1150,1156 **** + Redisplay(Widget w, XEvent *event, Region region) + { + XmEnhancedButtonWidget eb = (XmEnhancedButtonWidget) w; +! #ifndef LESSTIF_VERSION + XmDisplay dpy; + XtEnum default_button_emphasis; + #endif +--- 1150,1156 ---- + Redisplay(Widget w, XEvent *event, Region region) + { + XmEnhancedButtonWidget eb = (XmEnhancedButtonWidget) w; +! #if !defined(LESSTIF_VERSION) && (XmVersion > 1002) + XmDisplay dpy; + XtEnum default_button_emphasis; + #endif +*************** +*** 1162,1168 **** + if (!XtIsRealized((Widget)eb)) + return; + +! #ifndef LESSTIF_VERSION + dpy = (XmDisplay)XmGetXmDisplay(XtDisplay(eb)); + default_button_emphasis = dpy->display.default_button_emphasis; + #endif +--- 1162,1168 ---- + if (!XtIsRealized((Widget)eb)) + return; + +! #if !defined(LESSTIF_VERSION) && (XmVersion > 1002) + dpy = (XmDisplay)XmGetXmDisplay(XtDisplay(eb)); + default_button_emphasis = dpy->display.default_button_emphasis; + #endif +*************** +*** 1241,1247 **** + { + int adjust = 0; + +! #ifndef LESSTIF_VERSION + /* + * NOTE: PushButton has two types of shadows: primitive-shadow and + * default-button-shadow. If pushbutton is in a menu only primitive +--- 1241,1247 ---- + { + int adjust = 0; + +! #if !defined(LESSTIF_VERSION) && (XmVersion > 1002) + /* + * NOTE: PushButton has two types of shadows: primitive-shadow and + * default-button-shadow. If pushbutton is in a menu only primitive +*************** +*** 1289,1295 **** + adjust, adjust, rectwidth, rectheight, borderwidth); + } + +! #ifndef LESSTIF_VERSION + switch (default_button_emphasis) + { + case XmINTERNAL_HIGHLIGHT: +--- 1289,1295 ---- + adjust, adjust, rectwidth, rectheight, borderwidth); + } + +! #if !defined(LESSTIF_VERSION) && (XmVersion > 1002) + switch (default_button_emphasis) + { + case XmINTERNAL_HIGHLIGHT: +*************** +*** 1365,1371 **** + default_button_shadow_thickness = + eb->pushbutton.default_button_shadow_thickness; + +! #ifndef LESSTIF_VERSION + /* + * Compute location of bounding box to contain the + * defaultButtonShadow. +--- 1365,1371 ---- + default_button_shadow_thickness = + eb->pushbutton.default_button_shadow_thickness; + +! #if !defined(LESSTIF_VERSION) && (XmVersion > 1002) + /* + * Compute location of bounding box to contain the + * defaultButtonShadow. +*** ../vim-7.0.013/src/version.c Fri May 12 19:10:03 2006 +--- src/version.c Fri May 12 19:23:12 2006 +*************** +*** 668,669 **** +--- 668,671 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 14, + /**/ + +-- +hundred-and-one symptoms of being an internet addict: +126. You brag to all of your friends about your date Saturday night...but + you don't tell them it was only in a chat room. + + /// 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/7.0.015 b/7.0.015 new file mode 100644 index 0000000..acc5928 --- /dev/null +++ b/7.0.015 @@ -0,0 +1,204 @@ +To: vim-dev@vim.org +Subject: Patch 7.0.015 +Fcc: outbox +From: Bram Moolenaar +Mime-Version: 1.0 +Content-Type: text/plain; charset=ISO-8859-1 +Content-Transfer-Encoding: 8bit +------------ + +Patch 7.0.015 +Problem: Athena: compilation problems with modern compiler. +Solution: Avoid type casts for lvalue. (Alexey Froloff) +Files: src/gui_at_fs.c + + +*** ../vim-7.0.014/src/gui_at_fs.c Wed May 10 15:22:49 2006 +--- src/gui_at_fs.c Fri May 12 11:26:24 2006 +*************** +*** 1861,1887 **** + XtPointer pnew; + { + SFDir *dir; +! int nw; + + dir = &(SFdirs[SFdirPtr + (int)(long)n]); + + #ifdef FEAT_GUI_NEXTAW +! if ((int)(long)pnew < 0) + { +! if ((int)(long)pnew > -SFvScrollHeight) +! (int)(long)pnew = -1; + else +! (int)(long)pnew = -SFlistSize; + } +! else if ((int)(long)pnew > 0) + { +! if ((int)(long)pnew < SFvScrollHeight) +! (int)(long)pnew = 1; + else +! (int)(long)pnew = SFlistSize; + } + #endif +! nw = dir->vOrigin + (int)(long)pnew; + + if (nw > dir->nEntries - SFlistSize) + nw = dir->nEntries - SFlistSize; +--- 1861,1887 ---- + XtPointer pnew; + { + SFDir *dir; +! int nw = (int)(long)pnew; + + dir = &(SFdirs[SFdirPtr + (int)(long)n]); + + #ifdef FEAT_GUI_NEXTAW +! if (nw < 0) + { +! if (nw > -SFvScrollHeight) +! nw = -1; + else +! nw = -SFlistSize; + } +! else if (nw > 0) + { +! if (nw < SFvScrollHeight) +! nw = 1; + else +! nw = SFlistSize; + } + #endif +! nw += dir->vOrigin; + + if (nw > dir->nEntries - SFlistSize) + nw = dir->nEntries - SFlistSize; +*************** +*** 1941,1967 **** + XtPointer pnew; + { + SFDir *dir; +! int nw; + + dir = &(SFdirs[SFdirPtr + (int)(long)n]); + + #ifdef FEAT_GUI_NEXTAW +! if ((int)(long)pnew < 0) + { +! if ((int)(long)pnew > -SFhScrollWidth) +! (int)(long)pnew = -1; + else +! (int)(long)pnew = -SFcharsPerEntry; + } +! else if ((int)(long)pnew > 0) + { +! if ((int)(long)pnew < SFhScrollWidth) +! (int)(long)pnew = 1; + else +! (int)(long)pnew = SFcharsPerEntry; + } + #endif +! nw = dir->hOrigin + (int)(long)pnew; + + if (nw > dir->nChars - SFcharsPerEntry) + nw = dir->nChars - SFcharsPerEntry; +--- 1941,1967 ---- + XtPointer pnew; + { + SFDir *dir; +! int nw = (int)(long)pnew; + + dir = &(SFdirs[SFdirPtr + (int)(long)n]); + + #ifdef FEAT_GUI_NEXTAW +! if (nw < 0) + { +! if (nw > -SFhScrollWidth) +! nw = -1; + else +! nw = -SFcharsPerEntry; + } +! else if (nw > 0) + { +! if (nw < SFhScrollWidth) +! nw = 1; + else +! nw = SFcharsPerEntry; + } + #endif +! nw += dir->hOrigin; + + if (nw > dir->nChars - SFcharsPerEntry) + nw = dir->nChars - SFcharsPerEntry; +*************** +*** 2038,2063 **** + XtPointer client_data; + XtPointer pnew; + { +! int nw; + float f; + + #ifdef FEAT_GUI_NEXTAW +! if ((int)(long)pnew < 0) + { +! if ((int)(long)pnew > -SFpathScrollWidth) +! (int)(long)pnew = -1; + else +! (int)(long)pnew = -3; + } +! else if ((int)(long)pnew > 0) + { +! if ((int)(long)pnew < SFpathScrollWidth) +! (int)(long)pnew = 1; + else +! (int)(long)pnew = 3; + } + #endif +! nw = SFdirPtr + (int)(long)pnew; + + if (nw > SFdirEnd - 3) + nw = SFdirEnd - 3; +--- 2038,2063 ---- + XtPointer client_data; + XtPointer pnew; + { +! int nw = (int)(long)pnew; + float f; + + #ifdef FEAT_GUI_NEXTAW +! if (nw < 0) + { +! if (nw > -SFpathScrollWidth) +! nw = -1; + else +! nw = -3; + } +! else if (nw > 0) + { +! if (nw < SFpathScrollWidth) +! nw = 1; + else +! nw = 3; + } + #endif +! nw += SFdirPtr; + + if (nw > SFdirEnd - 3) + nw = SFdirEnd - 3; +*** ../vim-7.0.014/src/version.c Fri May 12 19:24:33 2006 +--- src/version.c Fri May 12 19:25:57 2006 +*************** +*** 668,669 **** +--- 668,671 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 15, + /**/ + +-- +hundred-and-one symptoms of being an internet addict: +127. You bring your laptop and cellular phone to church. + + /// 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/7.0.016 b/7.0.016 new file mode 100644 index 0000000..00f519c --- /dev/null +++ b/7.0.016 @@ -0,0 +1,67 @@ +To: vim-dev@vim.org +Subject: Patch 7.0.016 +Fcc: outbox +From: Bram Moolenaar +Mime-Version: 1.0 +Content-Type: text/plain; charset=ISO-8859-1 +Content-Transfer-Encoding: 8bit +------------ + +Patch 7.0.016 +Problem: Printing doesn't work for "dec-mcs" encoding. +Solution: Add "dec-mcs", "mac-roman" and "hp-roman8" to the list of + recognized 8-bit encodings. (Mike Williams) +Files: src/mbyte.c + + +*** ../vim-7.0.015/src/mbyte.c Wed May 10 15:22:50 2006 +--- src/mbyte.c Sat May 13 09:12:43 2006 +*************** +*** 311,317 **** + + #define IDX_MACROMAN 57 + {"macroman", ENC_8BIT + ENC_MACROMAN, 0}, /* Mac OS */ +! #define IDX_COUNT 58 + }; + + /* +--- 311,321 ---- + + #define IDX_MACROMAN 57 + {"macroman", ENC_8BIT + ENC_MACROMAN, 0}, /* Mac OS */ +! #define IDX_DECMCS 58 +! {"dec-mcs", ENC_8BIT, 0}, /* DEC MCS */ +! #define IDX_HPROMAN8 59 +! {"hp-roman8", ENC_8BIT, 0}, /* HP Roman8 */ +! #define IDX_COUNT 60 + }; + + /* +*************** +*** 386,391 **** +--- 390,396 ---- + {"950", IDX_BIG5}, + #endif + {"mac", IDX_MACROMAN}, ++ {"mac-roman", IDX_MACROMAN}, + {NULL, 0} + }; + +*** ../vim-7.0.015/src/version.c Fri May 12 19:27:55 2006 +--- src/version.c Sat May 13 09:11:27 2006 +*************** +*** 668,669 **** +--- 668,671 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 16, + /**/ + +-- +hundred-and-one symptoms of being an internet addict: +135. You cut classes or miss work so you can stay home and browse the web. + + /// 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/7.0.017 b/7.0.017 new file mode 100644 index 0000000..7580449 --- /dev/null +++ b/7.0.017 @@ -0,0 +1,64 @@ +To: vim-dev@vim.org +Subject: Patch 7.0.017 +Fcc: outbox +From: Bram Moolenaar +Mime-Version: 1.0 +Content-Type: text/plain; charset=ISO-8859-1 +Content-Transfer-Encoding: 8bit +------------ + +Patch 7.0.017 (after 7.0.014) +Problem: Linking gui_xmebw.c fails on Dec Alpha Tru64. (Rolfe) +Solution: Adjust defines for Motif 1.2 and older. +Files: src/gui_xmebw.c + + +*** ../vim-7.0.016/src/gui_xmebw.c Fri May 12 19:24:33 2006 +--- src/gui_xmebw.c Sat May 13 12:55:01 2006 +*************** +*** 47,59 **** + #include "gui_xmebwp.h" + + /* Provide some missing wrappers, which are missed from the LessTif +! * implementation. + * + * We neither use XmeGetPixmapData or _XmGetPixmapData, since with LessTif the + * pixmap will not appear in it's caches properly. We cache the interresting + * values in XmEnhancedButtonPart instead ourself. + */ +! #ifdef LESSTIF_VERSION + # ifndef Lab_IsMenupane + # define Lab_IsMenupane(w) (Lab_MenuType(w) == (int)XmMENU_POPUP || \ + Lab_MenuType(w) == (int)XmMENU_PULLDOWN) +--- 47,59 ---- + #include "gui_xmebwp.h" + + /* Provide some missing wrappers, which are missed from the LessTif +! * implementation. Also missing in Motif 1.2 and earlier. + * + * We neither use XmeGetPixmapData or _XmGetPixmapData, since with LessTif the + * pixmap will not appear in it's caches properly. We cache the interresting + * values in XmEnhancedButtonPart instead ourself. + */ +! #if defined(LESSTIF_VERSION) || (XmVersion <= 1002) + # ifndef Lab_IsMenupane + # define Lab_IsMenupane(w) (Lab_MenuType(w) == (int)XmMENU_POPUP || \ + Lab_MenuType(w) == (int)XmMENU_PULLDOWN) +*** ../vim-7.0.016/src/version.c Sat May 13 09:16:38 2006 +--- src/version.c Sat May 13 13:00:03 2006 +*************** +*** 668,669 **** +--- 668,671 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 17, + /**/ + +-- +hundred-and-one symptoms of being an internet addict: +141. You'd rather go to http://www.weather.com/ than look out your window. + + /// 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 /// -- 2.44.0