--- /dev/null
+To: vim-dev@vim.org
+Subject: Patch 7.1.146 (extra)
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.1.146 (extra)
+Problem: VMS: Files with a very rare record organization (VFC) cannot be
+ properly written by Vim.
+ On older VAX systems mms runs into a syntax error.
+Solution: Check for this special situation. Do not wrap a comment, make it
+ one long line. (Zoltan Arpadffy)
+Files: src/fileio.c, src/Make_vms.mms
+
+
+*** ../vim-7.1.145/src/fileio.c Wed Oct 3 12:49:24 2007
+--- src/fileio.c Mon Oct 22 21:10:00 2007
+***************
+*** 4251,4257 ****
+ * they don't it adds one.
+ * With other RMS structures it works perfect without this fix.
+ */
+! if ((buf->b_fab_rat & (FAB$M_FTN | FAB$M_CR)) != 0)
+ {
+ int b2write;
+
+--- 4252,4259 ----
+ * they don't it adds one.
+ * With other RMS structures it works perfect without this fix.
+ */
+! if (buf->b_fab_rfm == FAB$C_VFC
+! || ((buf->b_fab_rat & (FAB$M_FTN | FAB$M_CR)) != 0))
+ {
+ int b2write;
+
+*** ../vim-7.1.145/src/Make_vms.mms Thu May 10 20:47:35 2007
+--- src/Make_vms.mms Mon Oct 22 21:13:08 2007
+***************
+*** 2,8 ****
+ # Makefile for Vim on OpenVMS
+ #
+ # Maintainer: Zoltan Arpadffy <arpadffy@polarhome.com>
+! # Last change: 2007 May 07
+ #
+ # This has script been tested on VMS 6.2 to 8.2 on DEC Alpha, VAX and IA64
+ # with MMS and MMK
+--- 2,8 ----
+ # Makefile for Vim on OpenVMS
+ #
+ # Maintainer: Zoltan Arpadffy <arpadffy@polarhome.com>
+! # Last change: 2007 Oct 22
+ #
+ # This has script been tested on VMS 6.2 to 8.2 on DEC Alpha, VAX and IA64
+ # with MMS and MMK
+***************
+*** 96,103 ****
+
+ .IFDEF MMSVAX
+ .IFDEF DECC # VAX with DECC
+! CC_DEF = cc # /decc # some system requires this switch
+! # but when it is not required /ver might fail
+ PREFIX = /prefix=all
+ .ELSE # VAX with VAXC
+ CC_DEF = cc
+--- 96,102 ----
+
+ .IFDEF MMSVAX
+ .IFDEF DECC # VAX with DECC
+! CC_DEF = cc # /decc # some system requires this switch but when it is not required /ver might fail
+ PREFIX = /prefix=all
+ .ELSE # VAX with VAXC
+ CC_DEF = cc
+*** ../vim-7.1.145/src/version.c Fri Oct 19 20:39:56 2007
+--- src/version.c Mon Oct 29 22:36:20 2007
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 146,
+ /**/
+
+--
+Be thankful to be in a traffic jam, because it means you own a car.
+
+ /// 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 ///
--- /dev/null
+To: vim-dev@vim.org
+Subject: Patch 7.1.147
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.1.147 (after 7.1.127)
+Problem: Freeing memory already freed when completing user name. (Meino
+ Cramer)
+Solution: Use a flag to remember if "orig" needs to be freed.
+Files: src/ex_getln.c
+
+
+*** ../vim-7.1.146/src/ex_getln.c Sun Sep 30 22:10:45 2007
+--- src/ex_getln.c Tue Oct 30 17:13:33 2007
+***************
+*** 3353,3358 ****
+--- 3353,3359 ----
+ char_u *ss = NULL;
+ static int findex;
+ static char_u *orig_save = NULL; /* kept value of orig */
++ int orig_saved = FALSE;
+ int i;
+ long_u len;
+ int non_suf_match; /* number without matching suffix */
+***************
+*** 3421,3426 ****
+--- 3422,3428 ----
+ {
+ vim_free(orig_save);
+ orig_save = orig;
++ orig_saved = TRUE;
+
+ /*
+ * Do the expansion.
+***************
+*** 3546,3552 ****
+ ExpandCleanup(xp);
+
+ /* Free "orig" if it wasn't stored in "orig_save". */
+! if (orig != orig_save)
+ vim_free(orig);
+
+ return ss;
+--- 3548,3554 ----
+ ExpandCleanup(xp);
+
+ /* Free "orig" if it wasn't stored in "orig_save". */
+! if (!orig_saved)
+ vim_free(orig);
+
+ return ss;
+*** ../vim-7.1.146/src/version.c Mon Oct 29 22:37:57 2007
+--- src/version.c Tue Oct 30 17:30:35 2007
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 147,
+ /**/
+
+--
+hundred-and-one symptoms of being an internet addict:
+59. Your wife says communication is important in a marriage...so you buy
+ another computer and install a second phone line so the two of you can
+ chat.
+
+ /// 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 ///
--- /dev/null
+To: vim-dev@vim.org
+Subject: Patch 7.1.148
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.1.148
+Problem: Some types are not found by configure.
+Solution: Test for the sys/types.h header file. (Sean Boudreau)
+Files: src/configure.in, src/auto/configure
+
+
+*** ../vim-7.1.147/src/configure.in Thu Jun 28 13:02:22 2007
+--- src/configure.in Sat Oct 27 15:52:16 2007
+***************
+*** 2026,2032 ****
+ fi
+
+ AC_CHECK_HEADERS(stdarg.h stdlib.h string.h sys/select.h sys/utsname.h \
+! termcap.h fcntl.h sgtty.h sys/ioctl.h sys/time.h termio.h \
+ iconv.h langinfo.h unistd.h stropts.h errno.h \
+ sys/resource.h sys/systeminfo.h locale.h \
+ sys/stream.h sys/ptem.h termios.h libc.h sys/statfs.h \
+--- 2026,2032 ----
+ fi
+
+ AC_CHECK_HEADERS(stdarg.h stdlib.h string.h sys/select.h sys/utsname.h \
+! termcap.h fcntl.h sgtty.h sys/ioctl.h sys/time.h sys/types.h termio.h \
+ iconv.h langinfo.h unistd.h stropts.h errno.h \
+ sys/resource.h sys/systeminfo.h locale.h \
+ sys/stream.h sys/ptem.h termios.h libc.h sys/statfs.h \
+*** ../vim-7.1.147/src/auto/configure Thu Jun 28 13:02:22 2007
+--- src/auto/configure Sun Nov 4 15:34:14 2007
+***************
+*** 10265,10272 ****
+
+
+
+ for ac_header in stdarg.h stdlib.h string.h sys/select.h sys/utsname.h \
+! termcap.h fcntl.h sgtty.h sys/ioctl.h sys/time.h termio.h \
+ iconv.h langinfo.h unistd.h stropts.h errno.h \
+ sys/resource.h sys/systeminfo.h locale.h \
+ sys/stream.h sys/ptem.h termios.h libc.h sys/statfs.h \
+--- 10265,10273 ----
+
+
+
++
+ for ac_header in stdarg.h stdlib.h string.h sys/select.h sys/utsname.h \
+! termcap.h fcntl.h sgtty.h sys/ioctl.h sys/time.h sys/types.h termio.h \
+ iconv.h langinfo.h unistd.h stropts.h errno.h \
+ sys/resource.h sys/systeminfo.h locale.h \
+ sys/stream.h sys/ptem.h termios.h libc.h sys/statfs.h \
+*** ../vim-7.1.147/src/version.c Tue Oct 30 17:36:31 2007
+--- src/version.c Sun Nov 4 15:34:26 2007
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 148,
+ /**/
+
+--
+If your nose runs, and your feet smell, you might be upside down.
+
+ /// 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 ///
--- /dev/null
+To: vim-dev@vim.org
+Subject: Patch 7.1.149
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.1.149
+Problem: GTK GUI: When the completion popup menu is used scrolling another
+ window by the scrollbar is OK, but using the scroll wheel it
+ behaves line <Enter>.
+Solution: Ignore K_MOUSEDOWN and K_MOUSEUP. Fix redrawing the popup menu.
+Files: src/edit.c, src/gui.c
+
+
+*** ../vim-7.1.148/src/edit.c Fri Oct 19 20:39:56 2007
+--- src/edit.c Sun Nov 4 16:17:42 2007
+***************
+*** 3385,3392 ****
+ if (c != Ctrl_R && vim_is_ctrl_x_key(c))
+ edit_submode_extra = NULL;
+
+! /* Ignore end of Select mode mapping */
+! if (c == K_SELECT)
+ return retval;
+
+ /* Set "compl_get_longest" when finding the first matches. */
+--- 3385,3392 ----
+ if (c != Ctrl_R && vim_is_ctrl_x_key(c))
+ edit_submode_extra = NULL;
+
+! /* Ignore end of Select mode mapping and mouse scroll buttons. */
+! if (c == K_SELECT || c == K_MOUSEDOWN || c == K_MOUSEUP)
+ return retval;
+
+ /* Set "compl_get_longest" when finding the first matches. */
+***************
+*** 8652,8666 ****
+ int up;
+ {
+ pos_T tpos;
+! # if defined(FEAT_GUI) && defined(FEAT_WINDOWS)
+! win_T *old_curwin;
+ # endif
+
+ tpos = curwin->w_cursor;
+
+ # if defined(FEAT_GUI) && defined(FEAT_WINDOWS)
+- old_curwin = curwin;
+-
+ /* Currently the mouse coordinates are only known in the GUI. */
+ if (gui.in_use && mouse_row >= 0 && mouse_col >= 0)
+ {
+--- 8652,8667 ----
+ int up;
+ {
+ pos_T tpos;
+! # if defined(FEAT_WINDOWS)
+! win_T *old_curwin = curwin;
+! # endif
+! # ifdef FEAT_INS_EXPAND
+! int did_scroll = FALSE;
+ # endif
+
+ tpos = curwin->w_cursor;
+
+ # if defined(FEAT_GUI) && defined(FEAT_WINDOWS)
+ /* Currently the mouse coordinates are only known in the GUI. */
+ if (gui.in_use && mouse_row >= 0 && mouse_col >= 0)
+ {
+***************
+*** 8677,8692 ****
+ # endif
+ undisplay_dollar();
+
+! if (mod_mask & (MOD_MASK_SHIFT | MOD_MASK_CTRL))
+! scroll_redraw(up, (long)(curwin->w_botline - curwin->w_topline));
+! else
+! scroll_redraw(up, 3L);
+
+ # if defined(FEAT_GUI) && defined(FEAT_WINDOWS)
+ curwin->w_redr_status = TRUE;
+
+ curwin = old_curwin;
+ curbuf = curwin->w_buffer;
+ # endif
+
+ if (!equalpos(curwin->w_cursor, tpos))
+--- 8678,8717 ----
+ # endif
+ undisplay_dollar();
+
+! # ifdef FEAT_INS_EXPAND
+! /* Don't scroll the window in which completion is being done. */
+! if (!pum_visible()
+! # if defined(FEAT_WINDOWS)
+! || curwin != old_curwin
+! # endif
+! )
+! # endif
+! {
+! if (mod_mask & (MOD_MASK_SHIFT | MOD_MASK_CTRL))
+! scroll_redraw(up, (long)(curwin->w_botline - curwin->w_topline));
+! else
+! scroll_redraw(up, 3L);
+! # ifdef FEAT_INS_EXPAND
+! did_scroll = TRUE;
+! # endif
+! }
+
+ # if defined(FEAT_GUI) && defined(FEAT_WINDOWS)
+ curwin->w_redr_status = TRUE;
+
+ curwin = old_curwin;
+ curbuf = curwin->w_buffer;
++ # endif
++
++ # ifdef FEAT_INS_EXPAND
++ /* The popup menu may overlay the window, need to redraw it.
++ * TODO: Would be more efficient to only redraw the windows that are
++ * overlapped by the popup menu. */
++ if (pum_visible() && did_scroll)
++ {
++ redraw_all_later(NOT_VALID);
++ ins_compl_show_pum();
++ }
+ # endif
+
+ if (!equalpos(curwin->w_cursor, tpos))
+*** ../vim-7.1.148/src/gui.c Wed Sep 5 21:45:54 2007
+--- src/gui.c Fri Oct 19 16:14:57 2007
+***************
+*** 4214,4220 ****
+ #endif
+ )
+ {
+! redraw_win_later(wp, VALID);
+ updateWindow(wp); /* update window, status line, and cmdline */
+ }
+
+--- 4214,4232 ----
+ #endif
+ )
+ {
+! int type = VALID;
+!
+! #ifdef FEAT_INS_EXPAND
+! if (pum_visible())
+! {
+! type = NOT_VALID;
+! wp->w_lines_valid = 0;
+! }
+! #endif
+! /* Don't set must_redraw here, it may cause the popup menu to
+! * disappear when losing focus after a scrollbar drag. */
+! if (wp->w_redr_type < type)
+! wp->w_redr_type = type;
+ updateWindow(wp); /* update window, status line, and cmdline */
+ }
+
+*** ../vim-7.1.148/src/version.c Sun Nov 4 15:35:23 2007
+--- src/version.c Tue Nov 6 22:21:03 2007
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 149,
+ /**/
+
+--
+From "know your smileys":
+ ...---... SOS
+
+ /// 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 ///
--- /dev/null
+To: vim-dev@vim.org
+Subject: Patch 7.1.150
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.1.150
+Problem: When 'clipboard' has "unnamed" using "p" in Visual mode doesn't
+ work correctly. (Jianrong Yu)
+Solution: When 'clipboard' has "unnamed" also obtain the selection when
+ getting the default register.
+Files: src/ops.c
+
+
+*** ../vim-7.1.149/src/ops.c Tue Sep 25 14:19:35 2007
+--- src/ops.c Sun Oct 28 13:58:35 2007
+***************
+*** 933,941 ****
+ #ifdef FEAT_CLIPBOARD
+ /* When Visual area changed, may have to update selection. Obtain the
+ * selection too. */
+! if (name == '*' && clip_star.available && clip_isautosel())
+ {
+! clip_update_selection();
+ may_get_selection(name);
+ }
+ #endif
+--- 933,942 ----
+ #ifdef FEAT_CLIPBOARD
+ /* When Visual area changed, may have to update selection. Obtain the
+ * selection too. */
+! if (name == '*' && clip_star.available)
+ {
+! if (clip_isautosel())
+! clip_update_selection();
+ may_get_selection(name);
+ }
+ #endif
+*** ../vim-7.1.149/src/version.c Tue Nov 6 22:26:39 2007
+--- src/version.c Thu Nov 8 10:34:18 2007
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 150,
+ /**/
+
+--
+From "know your smileys":
+ 8<}} Glasses, big nose, beard
+
+ /// 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 ///
--- /dev/null
+To: vim-dev@vim.org
+Subject: Patch 7.1.151
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.1.151
+Problem: Using whole line completion with 'ignorecase' and 'infercase' set
+ and the line is empty get an lalloc(0) error.
+Solution: Don't try changing case for an empty match. (Matthew Wozniski)
+Files: src/edit.c
+
+
+*** ../vim-7.1.150/src/edit.c Tue Nov 6 22:26:39 2007
+--- src/edit.c Sun Nov 4 16:17:42 2007
+***************
+*** 2111,2117 ****
+ int has_lower = FALSE;
+ int was_letter = FALSE;
+
+! if (p_ic && curbuf->b_p_inf)
+ {
+ /* Infer case of completed part. */
+
+--- 2111,2117 ----
+ int has_lower = FALSE;
+ int was_letter = FALSE;
+
+! if (p_ic && curbuf->b_p_inf && len > 0)
+ {
+ /* Infer case of completed part. */
+
+***************
+*** 2225,2231 ****
+ wca[i] = MB_TOUPPER(wca[i]);
+ }
+
+! /*
+ * Generate encoding specific output from wide character array.
+ * Multi-byte characters can occupy up to five bytes more than
+ * ASCII characters, and we also need one byte for NUL, so stay
+--- 2225,2231 ----
+ wca[i] = MB_TOUPPER(wca[i]);
+ }
+
+! /*
+ * Generate encoding specific output from wide character array.
+ * Multi-byte characters can occupy up to five bytes more than
+ * ASCII characters, and we also need one byte for NUL, so stay
+*** ../vim-7.1.150/src/version.c Thu Nov 8 10:35:02 2007
+--- src/version.c Thu Nov 8 13:01:34 2007
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 151,
+ /**/
+
+--
+From "know your smileys":
+ %-) After staring at screen for 15 hours
+
+ /// 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 ///
--- /dev/null
+To: vim-dev@vim.org
+Subject: Patch 7.1.152
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.1.152
+Problem: Display problem when 'hls' and 'cursorcolumn' are set and
+ searching for "$". (John Mullin) Also when scrolling
+ horizontally when 'wrap' is off.
+Solution: Keep track of the column where highlighting was set. Check the
+ column offset when skipping characters.
+Files: src/screen.c
+
+
+*** ../vim-7.1.151/src/screen.c Mon Sep 17 22:37:05 2007
+--- src/screen.c Fri Oct 19 15:18:49 2007
+***************
+*** 2599,2604 ****
+--- 2599,2605 ----
+ int syntax_attr = 0; /* attributes desired by syntax */
+ int has_syntax = FALSE; /* this buffer has syntax highl. */
+ int save_did_emsg;
++ int eol_hl_off = 0; /* 1 if highlighted char after EOL */
+ #endif
+ #ifdef FEAT_SPELL
+ int has_spell = FALSE; /* this buffer has spell checking */
+***************
+*** 4312,4317 ****
+--- 4313,4322 ----
+ {
+ #ifdef FEAT_SEARCH_EXTRA
+ long prevcol = (long)(ptr - line) - (c == NUL);
++
++ /* we're not really at that column when skipping some text */
++ if ((wp->w_p_wrap ? wp->w_skipcol : wp->w_leftcol) > prevcol)
++ ++prevcol;
+ #endif
+
+ /* invert at least one char, used for Visual and empty line or
+***************
+*** 4408,4418 ****
+--- 4413,4432 ----
+ ScreenAttrs[off] = char_attr;
+ #ifdef FEAT_RIGHTLEFT
+ if (wp->w_p_rl)
++ {
+ --col;
++ --off;
++ }
+ else
+ #endif
++ {
+ ++col;
++ ++off;
++ }
+ ++vcol;
++ #ifdef FEAT_SYN_HL
++ eol_hl_off = 1;
++ #endif
+ }
+ }
+
+***************
+*** 4422,4427 ****
+--- 4436,4449 ----
+ 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;
++ --off;
++ --vcol;
++ }
++
+ /* Highlight 'cursorcolumn' past end of the line. */
+ if (wp->w_p_wrap)
+ v = wp->w_skipcol;
+***************
+*** 4432,4438 ****
+
+ vcol = v + col - win_col_off(wp);
+ if (wp->w_p_cuc
+! && (int)wp->w_virtcol >= vcol
+ && (int)wp->w_virtcol < W_WIDTH(wp) * (row - startrow + 1)
+ + v
+ && lnum != wp->w_cursor.lnum
+--- 4454,4460 ----
+
+ vcol = v + col - win_col_off(wp);
+ if (wp->w_p_cuc
+! && (int)wp->w_virtcol >= vcol - eol_hl_off
+ && (int)wp->w_virtcol < W_WIDTH(wp) * (row - startrow + 1)
+ + v
+ && lnum != wp->w_cursor.lnum
+*** ../vim-7.1.151/src/version.c Thu Nov 8 13:03:33 2007
+--- src/version.c Thu Nov 8 14:48:59 2007
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 152,
+ /**/
+
+--
+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 ///
--- /dev/null
+To: vim-dev@vim.org
+Subject: Patch 7.1.153
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.1.153
+Problem: Compiler warnings on SGI. Undefined XpmAllocColor (Charles
+ Campbell)
+Solution: Add type casts. Init st_dev and st_ino separately. Don't use
+ type casts for vim_snprintf() when HAVE_STDARG_H is defined.
+ Define XpmAllocColor when needed.
+Files: src/eval.c, src/ex_cmds.c, src/fileio.c, src/misc2.c,
+ src/gui_xmebw.c
+
+
+*** ../vim-7.1.152/src/eval.c Tue Oct 2 22:07:58 2007
+--- src/eval.c Mon Oct 1 20:56:09 2007
+***************
+*** 8729,8735 ****
+ static int fnum = 0;
+ static int change_start = 0;
+ static int change_end = 0;
+! static hlf_T hlID = 0;
+ int filler_lines;
+ int col;
+
+--- 8729,8735 ----
+ static int fnum = 0;
+ static int change_start = 0;
+ static int change_end = 0;
+! static hlf_T hlID = (hlf_T)0;
+ int filler_lines;
+ int col;
+
+*** ../vim-7.1.152/src/ex_cmds.c Thu Sep 13 18:25:08 2007
+--- src/ex_cmds.c Thu Sep 13 16:19:40 2007
+***************
+*** 1774,1780 ****
+ * overwrite a user's viminfo file after a "su root", with a
+ * viminfo file that the user can't read.
+ */
+! st_old.st_dev = st_old.st_ino = 0;
+ st_old.st_mode = 0600;
+ if (mch_stat((char *)fname, &st_old) == 0
+ && getuid() != ROOT_UID
+--- 1774,1781 ----
+ * overwrite a user's viminfo file after a "su root", with a
+ * viminfo file that the user can't read.
+ */
+! st_old.st_dev = 0;
+! st_old.st_ino = 0;
+ st_old.st_mode = 0600;
+ if (mch_stat((char *)fname, &st_old) == 0
+ && getuid() != ROOT_UID
+*** ../vim-7.1.152/src/fileio.c Mon Oct 29 22:37:57 2007
+--- src/fileio.c Mon Oct 22 21:10:00 2007
+***************
+*** 3209,3215 ****
+ * Get information about original file (if there is one).
+ */
+ #if defined(UNIX) && !defined(ARCHIE)
+! st_old.st_dev = st_old.st_ino = 0;
+ perm = -1;
+ if (mch_stat((char *)fname, &st_old) < 0)
+ newfile = TRUE;
+--- 3209,3216 ----
+ * Get information about original file (if there is one).
+ */
+ #if defined(UNIX) && !defined(ARCHIE)
+! st_old.st_dev = 0;
+! st_old.st_ino = 0;
+ perm = -1;
+ if (mch_stat((char *)fname, &st_old) < 0)
+ newfile = TRUE;
+*** ../vim-7.1.152/src/misc2.c Sun Oct 7 15:44:28 2007
+--- src/misc2.c Sun Sep 30 18:00:09 2007
+***************
+*** 5924,5930 ****
+--- 5925,5935 ----
+ {
+ if (emsg_not_now())
+ return TRUE; /* no error messages at the moment */
++ #ifdef HAVE_STDARG_H
++ vim_snprintf((char *)IObuff, IOSIZE, (char *)s, a1, a2);
++ #else
+ vim_snprintf((char *)IObuff, IOSIZE, (char *)s, (long_u)a1, (long_u)a2);
++ #endif
+ return emsg(IObuff);
+ }
+
+*** ../vim-7.1.152/src/gui_xmebw.c Thu May 10 19:46:55 2007
+--- src/gui_xmebw.c Thu Sep 6 12:57:51 2007
+***************
+*** 395,405 ****
+
+ /* Create the "highlight" pixmap. */
+ color[4].pixel = eb->primitive.bottom_shadow_color;
+ attr.valuemask = XpmColorSymbols | XpmCloseness | XpmAllocColor;
+ attr.closeness = 65535; /* accuracy isn't crucial */
+ attr.colorsymbols = color;
+ attr.numsymbols = XtNumber(color);
+- attr.alloc_color = alloc_color;
+
+ status = XpmCreatePixmapFromData(dpy, root, data, &pix, NULL, &attr);
+ XpmFreeAttributes(&attr);
+--- 395,409 ----
+
+ /* Create the "highlight" pixmap. */
+ color[4].pixel = eb->primitive.bottom_shadow_color;
++ #ifdef XpmAllocColor /* SGI doesn't have it */
+ attr.valuemask = XpmColorSymbols | XpmCloseness | XpmAllocColor;
++ attr.alloc_color = alloc_color;
++ #else
++ attr.valuemask = XpmColorSymbols | XpmCloseness;
++ #endif
+ attr.closeness = 65535; /* accuracy isn't crucial */
+ attr.colorsymbols = color;
+ attr.numsymbols = XtNumber(color);
+
+ status = XpmCreatePixmapFromData(dpy, root, data, &pix, NULL, &attr);
+ XpmFreeAttributes(&attr);
+*** ../vim-7.1.152/src/version.c Thu Nov 8 14:50:58 2007
+--- src/version.c Thu Nov 8 20:45:56 2007
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 153,
+ /**/
+
+--
+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 ///
--- /dev/null
+To: vim-dev@vim.org
+Subject: Patch 7.1.154
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.1.154
+Problem: Compiler warning for signed/unsigned compare.
+Solution: Add type cast.
+Files: src/screen.c
+
+
+*** ../vim-7.1.153/src/screen.c Thu Nov 8 14:50:58 2007
+--- src/screen.c Thu Nov 8 21:18:46 2007
+***************
+*** 4315,4321 ****
+ long prevcol = (long)(ptr - line) - (c == NUL);
+
+ /* we're not really at that column when skipping some text */
+! if ((wp->w_p_wrap ? wp->w_skipcol : wp->w_leftcol) > prevcol)
+ ++prevcol;
+ #endif
+
+--- 4315,4321 ----
+ long prevcol = (long)(ptr - line) - (c == NUL);
+
+ /* we're not really at that column when skipping some text */
+! if ((long)(wp->w_p_wrap ? wp->w_skipcol : wp->w_leftcol) > prevcol)
+ ++prevcol;
+ #endif
+
+*** ../vim-7.1.153/src/version.c Thu Nov 8 20:47:34 2007
+--- src/version.c Thu Nov 8 21:19:59 2007
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 154,
+ /**/
+
+--
+From "know your smileys":
+ :-F Bucktoothed vampire with one tooth missing
+
+ /// 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 ///
%bcond_without home_etc # without home_etc support
#
%define _ver 7.1
-%define _patchlevel 145
+%define _patchlevel 154
%define _rel 2
# cflags get changed while configuring
projects / packages / vim.git / commitdiff