markus--
today svn bumped my source up to v101 from v93, and i find i
can no longer politely build vim -- make breaks with:
normal.c: In function 'nv_g_cmd':
normal.c:7843: error: expected expression before '<<' token
make[1]: *** [objects/normal.o] Error 1
make[1]: Leaving directory `/home/scott/.build/vim/vim7.2/src'
make: *** [first] Error 2
that was with a normal.c which svn had tried to merge with
our patched normal.c
i removed normal.c, asked svn to get me a fresh one,
extracted the normal.c portion of the relative number patch,
and attempted to apply it -- this failed with:
~/.build/vim/vim7.2 $ patch -p0 < normal.patch 2>&1 | tee normal.log
patching file src/normal.c
Hunk #1 FAILED at 7783.
1 out of 1 hunk FAILED -- saving rejects to file src/normal.c.rej
and normal.c.rej contains:
~/.build/vim/vim7.2 $ cat src/normal.c.rej
***************
*** 7783,7790 ****
}
else
i = curwin->w_leftcol;
! /* Go to the middle of the screen line. When 'number' is on and lines
! * are wrapping the middle can be more to the left.*/
if (cap->nchar == 'm')
i += (W_WIDTH(curwin) - curwin_col_off()
+ ((curwin->w_p_wrap && i > 0)
--- 7783,7791 ----
}
else
i = curwin->w_leftcol;
! /* Go to the middle of the screen line. When 'number' or
! * 'relativenumber' is on and lines are wrapping the middle can be more
! * to the left.*/
if (cap->nchar == 'm')
i += (W_WIDTH(curwin) - curwin_col_off()
+ ((curwin->w_p_wrap && i > 0)
now i really love the relnum patch and i hope i won't fall
too far behind if i wait for a new patch instead of building
v101 without it
sc
--~--~---------~--~----~------------~-------~--~----~
You received this message from the "vim_dev" maillist.
For more information, visit http://www.vim.org/maillist.php
-~----------~----~----~----~------~----~------~--~---
