Patch 8.1.0155
Patch 8.1.0155
Problem:Evim.man missing from the distribution.
Solution: Add it to the list.
Files: Filelist
*** ../vim-8.1.0154/Filelist2018-07-04 23:05:19.221931527 +0200
--- Filelist2018-07-05 22:56:27.346990258 +0200
***
*** 710,715
--- 710,716
# runtime for Amiga (also in the extra archive)
RT_AMI_DOS = \
+ runtime/doc/evim.man \
runtime/doc/vim.man \
runtime/doc/vimdiff.man \
runtime/doc/vimtutor.man \
*** ../vim-8.1.0154/src/version.c 2018-07-05 22:27:04.463630279 +0200
--- src/version.c 2018-07-05 22:57:19.182722612 +0200
***
*** 791,792
--- 791,794
{ /* Add new patch number below this line */
+ /**/
+ 155,
/**/
--
I'm in shape. Round IS a shape.
/// Bram Moolenaar -- b...@moolenaar.net -- http://www.Moolenaar.net \\\
///sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\ an exciting new programming language -- http://www.Zimbu.org///
\\\help me help AIDS victims -- http://ICCF-Holland.org///
--
--
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php
---
You received this message because you are subscribed to the Google Groups
"vim_dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to vim_dev+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.
Patch 8.1.0154
Patch 8.1.0154
Problem:Crash with "set smarttab shiftwidth=0 softtabstop=-1".
Solution: Fall back to using 'tabstop'. (closes #3155)
Files: src/edit.c, src/testdir/test_tab.vim
*** ../vim-8.1.0153/src/edit.c 2018-07-02 20:51:21.031882115 +0200
--- src/edit.c 2018-07-05 22:23:27.440802276 +0200
***
*** 9347,9366
&& (!*inserted_space_p
|| arrow_used))
{
- #ifndef FEAT_VARTABS
int ts;
- #endif
colnr_T vcol;
colnr_T want_vcol;
colnr_T start_vcol;
*inserted_space_p = FALSE;
- #ifndef FEAT_VARTABS
- if (p_sta && in_indent)
- ts = (int)get_sw_value(curbuf);
- else
- ts = (int)get_sts_value();
- #endif
/* Compute the virtual column where we want to be. Since
* 'showbreak' may get in the way, need to get the last column of
* the previous character. */
--- 9347,9358
***
*** 9371,9381
inc_cursor();
#ifdef FEAT_VARTABS
if (p_sta && in_indent)
! want_vcol = (want_vcol / curbuf->b_p_sw) * curbuf->b_p_sw;
else
want_vcol = tabstop_start(want_vcol, get_sts_value(),
curbuf->b_p_vsts_array);
#else
want_vcol = (want_vcol / ts) * ts;
#endif
--- 9363,9380
inc_cursor();
#ifdef FEAT_VARTABS
if (p_sta && in_indent)
! {
! ts = (int)get_sw_value(curbuf);
! want_vcol = (want_vcol / ts) * ts;
! }
else
want_vcol = tabstop_start(want_vcol, get_sts_value(),
curbuf->b_p_vsts_array);
#else
+ if (p_sta && in_indent)
+ ts = (int)get_sw_value(curbuf);
+ else
+ ts = (int)get_sts_value();
want_vcol = (want_vcol / ts) * ts;
#endif
***
*** 10200,10206
#ifdef FEAT_VARTABS
if (p_sta && ind) /* insert tab in indent, use 'shiftwidth' */
{
! temp = (int)curbuf->b_p_sw;
temp -= get_nolist_virtcol() % temp;
}
else if (tabstop_count(curbuf->b_p_vsts_array) > 0 || curbuf->b_p_sts !=
0)
--- 10199,10205
#ifdef FEAT_VARTABS
if (p_sta && ind) /* insert tab in indent, use 'shiftwidth' */
{
! temp = (int)get_sw_value(curbuf);
temp -= get_nolist_virtcol() % temp;
}
else if (tabstop_count(curbuf->b_p_vsts_array) > 0 || curbuf->b_p_sts !=
0)
*** ../vim-8.1.0153/src/testdir/test_tab.vim2018-07-02 20:51:21.035882093
+0200
--- src/testdir/test_tab.vim2018-07-05 22:19:41.994015889 +0200
***
*** 76,81
exe "normal A\x\"
call assert_equal("x x", getline(1))
! set sts=0 sw=0 backspace&
bwipe!
endfunc
--- 76,90
exe "normal A\x\"
call assert_equal("x x", getline(1))
! call setline(1, 'x')
! set sts=-1 sw=0 smarttab
! exe "normal I\\"
! call assert_equal("\tx", getline(1))
!
! call setline(1, 'x')
! exe "normal I\\\"
! call assert_equal("x", getline(1))
!
! set sts=0 sw=0 backspace& nosmarttab
bwipe!
endfunc
*** ../vim-8.1.0153/src/version.c 2018-07-05 17:11:15.726937929 +0200
--- src/version.c 2018-07-05 22:26:36.351782249 +0200
***
*** 791,792
--- 791,794
{ /* Add new patch number below this line */
+ /**/
+ 154,
/**/
--
A computer program does what you tell it to do, not what you want it to do.
/// Bram Moolenaar -- b...@moolenaar.net -- http://www.Moolenaar.net \\\
///sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\ an exciting new programming language -- http://www.Zimbu.org///
\\\help me help AIDS victims -- http://ICCF-Holland.org///
--
--
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php
---
You received this message because you are subscribed to the Google Groups
"vim_dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to vim_dev+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.
Re: Patch for VimL ftplugin: undo buffer-local maps
Tom Ryder wrote: > Hello Vim developers; attached is a small patch to the VimL runtime > ftplugin that extends its b:undo_ftplugin variable to clear away a set > of buffer-local maps, if assigned, so that they don't stick around if > the filetype changes. Thanks for the patch. The string is getting a bit long, I'll turn it into a function. And check that the mappings were actually installed. > There are similar problems in other ftplugins, such as php.vim's square > bracket maps. I'm willing to fix some of those up too, if appropriate. Please send a note to each maintainer. The plugins are not centrally maintained, there are many maintainers. -- hundred-and-one symptoms of being an internet addict: 188. You purchase a laptop so you can surf while sitting on the can. /// Bram Moolenaar -- b...@moolenaar.net -- http://www.Moolenaar.net \\\ ///sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ an exciting new programming language -- http://www.Zimbu.org/// \\\help me help AIDS victims -- http://ICCF-Holland.org/// -- -- You received this message from the "vim_dev" maillist. Do not top-post! Type your reply below the text you are replying to. For more information, visit http://www.vim.org/maillist.php --- You received this message because you are subscribed to the Google Groups "vim_dev" group. To unsubscribe from this group and stop receiving emails from it, send an email to vim_dev+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/d/optout.
Re: Test failed: Test_cmdline_complete_user_names()
Nazri Ramliy wrote:
> Hi,
>
> The test Test_cmdline_complete_user_names() failed on my machine because it
> assumes that the current username's first letter is unique, which not the case
> on my machine:
>
> if has('unix') && executable('whoami')
> let whoami = systemlist('whoami')[0]
> let first_letter = whoami[0]
> if len(first_letter) > 0
> " Trying completion of :e ~x where x is the first letter of
> " the user name should complete to at least the user name.
> call feedkeys(':e ~' . first_letter . "\\\"\", 'tx')
> call assert_match('^"e \~.*\<' . whoami . '\>', @:)
> endif
> endif
>
> If the current username is "foo" and there exist another username "f", then
> the
> test would fail because "':e ~' . first_letter" would expand to "/home/f"
> instead of what the test expects which is "/home/foo".
No, that is not what the test is doing. The \ expands
all completions. So I would expect the test to pass if multiple
usernames start with a letter.
On my machine, typing :e ~p I get multiple user names:
:e ~pel proxy pulse
Could you copy paste the message when the test fails?
The call to assert_match() should print the actual string
vs the expected regexp.
Dominique
--
--
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php
---
You received this message because you are subscribed to the Google Groups
"vim_dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to vim_dev+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.
Re: [PATCH] Copy Make_all.mak to SHADOWDIR
Tony wrote: > On Thu, Jul 5, 2018 at 11:30 AM, Elimar Riesebieter wrote: > > * Tony Mechelynck [2018-07-05 09:49 +0200]: > > > > [...] > > > >> Since there is no reason a user would modify the Make_all.mak, a link > >> is enough (like for most other sources) -- see attached patch. > > > > Shouldn't there be a slash at '..Make_all.mak .' ? > > Oops, yes, there should. I attach the revised patch. Proof of the > well-known fact that every patch should be checked by at least one > pair of eyes in addition to those of its author. Thanks for the patch. I should not make changes late at night... -- hundred-and-one symptoms of being an internet addict: 183. You move your coffeemaker next to your computer. /// Bram Moolenaar -- b...@moolenaar.net -- http://www.Moolenaar.net \\\ ///sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ an exciting new programming language -- http://www.Zimbu.org/// \\\help me help AIDS victims -- http://ICCF-Holland.org/// -- -- You received this message from the "vim_dev" maillist. Do not top-post! Type your reply below the text you are replying to. For more information, visit http://www.vim.org/maillist.php --- You received this message because you are subscribed to the Google Groups "vim_dev" group. To unsubscribe from this group and stop receiving emails from it, send an email to vim_dev+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/d/optout.
Patch 8.1.0153
Patch 8.1.0153 (after 8.1.0152)
Problem:Build with SHADOWDIR fails. (Elimar Riesebieter)
Solution: Create a link for Make_all.mak. (Tony Mechelynck)
Files: src/Makefile
*** ../vim-8.1.0152/src/Makefile2018-07-04 23:05:19.221931527 +0200
--- src/Makefile2018-07-05 17:08:32.727810237 +0200
***
*** 2681,2687
shadow: runtime pixmaps
$(MKDIR_P) $(SHADOWDIR)
! cd $(SHADOWDIR); ln -s ../*.[chm] ../*.in ../*.sh ../*.xs ../*.xbm
../gui_gtk_res.xml ../toolcheck ../proto ../libvterm ../vimtutor ../gvimtutor
../install-sh .
mkdir $(SHADOWDIR)/auto
cd $(SHADOWDIR)/auto; ln -s ../../auto/configure .
$(MKDIR_P) $(SHADOWDIR)/po
--- 2681,2687
shadow: runtime pixmaps
$(MKDIR_P) $(SHADOWDIR)
! cd $(SHADOWDIR); ln -s ../*.[chm] ../*.in ../*.sh ../*.xs ../*.xbm
../gui_gtk_res.xml ../toolcheck ../proto ../libvterm ../vimtutor ../gvimtutor
../install-sh ../Make_all.mak .
mkdir $(SHADOWDIR)/auto
cd $(SHADOWDIR)/auto; ln -s ../../auto/configure .
$(MKDIR_P) $(SHADOWDIR)/po
*** ../vim-8.1.0152/src/version.c 2018-07-04 23:05:19.221931527 +0200
--- src/version.c 2018-07-05 17:09:44.847425259 +0200
***
*** 791,792
--- 791,794
{ /* Add new patch number below this line */
+ /**/
+ 153,
/**/
--
hundred-and-one symptoms of being an internet addict:
184. You no longer ask prospective dates what their sign is, instead
your line is "Hi, what's your URL?"
/// Bram Moolenaar -- b...@moolenaar.net -- http://www.Moolenaar.net \\\
///sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\ an exciting new programming language -- http://www.Zimbu.org///
\\\help me help AIDS victims -- http://ICCF-Holland.org///
--
--
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php
---
You received this message because you are subscribed to the Google Groups
"vim_dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to vim_dev+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.
Test failed: Test_cmdline_complete_user_names()
Hi,
The test Test_cmdline_complete_user_names() failed on my machine because it
assumes that the current username's first letter is unique, which not the case
on my machine:
if has('unix') && executable('whoami')
let whoami = systemlist('whoami')[0]
let first_letter = whoami[0]
if len(first_letter) > 0
" Trying completion of :e ~x where x is the first letter of
" the user name should complete to at least the user name.
call feedkeys(':e ~' . first_letter . "\\\"\", 'tx')
call assert_match('^"e \~.*\<' . whoami . '\>', @:)
endif
endif
If the current username is "foo" and there exist another username "f", then the
test would fail because "':e ~' . first_letter" would expand to "/home/f"
instead of what the test expects which is "/home/foo".
Perhaps taking most of the username would be a better approach? Although it can
still fail on a system where there are two usernames where the only difference
between them is the last letter, for example "foo" and "foa".
$ git diff src/testdir/test_cmdline.vim
diff --git src/testdir/test_cmdline.vim src/testdir/test_cmdline.vim
index 26d33d838..5874f72cd 100644
--- src/testdir/test_cmdline.vim
+++ src/testdir/test_cmdline.vim
@@ -394,11 +394,11 @@ endfunc
func Test_cmdline_complete_user_names()
if has('unix') && executable('whoami')
let whoami = systemlist('whoami')[0]
-let first_letter = whoami[0]
-if len(first_letter) > 0
+let a_letter_short = whoami[0:-2]
+if len(a_letter_short) > 0
" Trying completion of :e ~x where x is the first letter of
" the user name should complete to at least the user name.
- call feedkeys(':e ~' . first_letter . "\\\"\", 'tx')
+ call feedkeys(':e ~' . a_letter_short . "\\\"\", 'tx')
call assert_match('^"e \~.*\<' . whoami . '\>', @:)
endif
endif
Nazri
--
--
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php
---
You received this message because you are subscribed to the Google Groups
"vim_dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to vim_dev+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.
Re: [PATCH] Copy Make_all.mak to SHADOWDIR
On Thu, Jul 5, 2018 at 11:46 AM, Elimar Riesebieter wrote: > * Tony Mechelynck [2018-07-05 11:39 +0200]: > >> On Thu, Jul 5, 2018 at 11:30 AM, Elimar Riesebieter >> wrote: >> > * Tony Mechelynck [2018-07-05 09:49 +0200]: >> > >> > [...] >> > >> >> Since there is no reason a user would modify the Make_all.mak, a link >> >> is enough (like for most other sources) -- see attached patch. >> > >> > Shouldn't there be a slash at '..Make_all.mak .' ? >> >> Oops, yes, there should. I attach the revised patch. Proof of the >> well-known fact that every patch should be checked by at least one >> pair of eyes in addition to those of its author. > > Applying the patch and fire up a compilerun would be a good test... In this case I would need to create a new shadow directory and _then_ compile: let's say (since I already have a shadow-huge and a shadow-tiny) hg qpush cd src SHADOWDIR='shadow-normal' make -e shadow cd shadow-normal # let's build the environment for "normal" compiles, including VIM_NAME = vim-normal to tell it apart from vi (tiny) and vim (huge) vim myconfig source ./myconfig # since we haven't yet configured, make with no arguments will configure and compile make # no need to reinstall the runtime files, those of Huge are OK make installvimbin vim-normal --version cd ../.. hg qpop "make shadow" runs configure, which I don't want yet; this implies that it ran "make config" implicitly. I don't know how to avoid that. I build a "normal" gvim, with GUI but otherwise very simplified from my "huge" gvim, as follows: export CONF_OPT_GUI='--enable-gui=gnome2' export CONF_OPT_MULTIBYTE='--enable-multibyte' export CONF_OPT_AUTOSERVE='--enable-autoservername' export CONF_OPT_FEAT='--with-features=normal' export CONF_OPT_COMPBY='"--with-compiledby=antoine.mechely...@gmail.com"' export CONF_ARGS='--with-vim-name=vim-normal' Oh, and before compiling I intentionally replace config.mk.dist and Makefile by lilnks rather than copies in the shadow dir: this way they will pick up any future changes in their counterparts one level up in src/ -- as follows: ln -svft . ../config.mk.dist ../Makefile After "make", before "make install" the executable is named "vim", not "vim-normal", let's run "make reconfig" but this time with logging. configure didn't get its --with-vim-name argument! Let's swap the last two lines of the config file and source it again... it works! And yet export CONF_ARGS='--with-vim-name=vi' works as the last line of the Tiny build... Here is the output of "vim-normal --version": linux-2iyu:~ # vim-normal --version VIM - Vi IMproved 8.1 (2018 May 18, compiled Jul 5 2018 13:41:48) Included patches: 1-152 Compiled by antoine.mechely...@gmail.com Normal version with GTK2-GNOME GUI. Features included (+) or not (-): +acl -farsi -mouse_sgr -tag_any_white -arabic+file_in_path -mouse_sysmouse-tcl +autocmd +find_in_path -mouse_urxvt -termguicolors +autoservername+float +mouse_xterm -terminal +balloon_eval +folding +multi_byte+terminfo -balloon_eval_term -footer+multi_lang+termresponse +browse+fork()-mzscheme +textobjects +builtin_terms +gettext +netbeans_intg +timers +byte_offset -hangul_input +num64 +title +channel +iconv +packages +toolbar +cindent +insert_expand +path_extra+user_commands +clientserver +job -perl -vartabs +clipboard +jumplist +persistent_undo +vertsplit +cmdline_compl -keymap+postscript+virtualedit +cmdline_hist +lambda+printer +visual +cmdline_info -langmap -profile +visualextra +comments +libcall -python+viminfo -conceal +linebreak -python3 +vreplace +cryptv+lispindent+quickfix +wildignore -cscope+listcmds +reltime +wildmenu +cursorbind+localmap -rightleft +windows +cursorshape -lua -ruby +writebackup +dialog_con_gui+menu +scrollbind+X11 +diff +mksession +signs -xfontset +digraphs +modify_fname +smartindent +xim +dnd +mouse +startuptime +xpm -ebcdic+mouseshape+statusline+xsmp_interact -emacs_tags-mouse_dec -sun_workshop +xterm_clipboard +eval +mouse_gpm +syntax+xterm_save +ex_extra -mouse_jsbterm +tag_binary +extra_search -mouse_netterm -tag_old_static system vimrc file: "$VIM/vimrc" user vimrc file: "$HOME/.vimrc" 2nd user vimrc file: "~/.vim/vimrc" user exrc file: "$HOME/.exrc" system
Re: [PATCH] Copy Make_all.mak to SHADOWDIR
* Tony Mechelynck [2018-07-05 11:39 +0200]: > On Thu, Jul 5, 2018 at 11:30 AM, Elimar Riesebieter wrote: > > * Tony Mechelynck [2018-07-05 09:49 +0200]: > > > > [...] > > > >> Since there is no reason a user would modify the Make_all.mak, a link > >> is enough (like for most other sources) -- see attached patch. > > > > Shouldn't there be a slash at '..Make_all.mak .' ? > > Oops, yes, there should. I attach the revised patch. Proof of the > well-known fact that every patch should be checked by at least one > pair of eyes in addition to those of its author. Applying the patch and fire up a compilerun would be a good test... BTW, don't you have 'one pair of eyes'? Elimar -- Learned men are the cisterns of knowledge, not the fountainheads ;-) -- -- You received this message from the "vim_dev" maillist. Do not top-post! Type your reply below the text you are replying to. For more information, visit http://www.vim.org/maillist.php --- You received this message because you are subscribed to the Google Groups "vim_dev" group. To unsubscribe from this group and stop receiving emails from it, send an email to vim_dev+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/d/optout.
Re: [PATCH] Copy Make_all.mak to SHADOWDIR
On Thu, Jul 5, 2018 at 11:30 AM, Elimar Riesebieter wrote: > * Tony Mechelynck [2018-07-05 09:49 +0200]: > > [...] > >> Since there is no reason a user would modify the Make_all.mak, a link >> is enough (like for most other sources) -- see attached patch. > > Shouldn't there be a slash at '..Make_all.mak .' ? Oops, yes, there should. I attach the revised patch. Proof of the well-known fact that every patch should be checked by at least one pair of eyes in addition to those of its author. > > Elimar Best regards, Tony. -- -- You received this message from the "vim_dev" maillist. Do not top-post! Type your reply below the text you are replying to. For more information, visit http://www.vim.org/maillist.php --- You received this message because you are subscribed to the Google Groups "vim_dev" group. To unsubscribe from this group and stop receiving emails from it, send an email to vim_dev+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/d/optout. # HG changeset patch # Parent 5b8606d91016c548240f348191933e0e3527388e Add Make_all.mak to target "shadow" diff --git a/src/Makefile b/src/Makefile --- a/src/Makefile +++ b/src/Makefile @@ -2676,17 +2676,17 @@ clean celan: testclean fi # Make a shadow directory for compilation on another system or with different # features. SHADOWDIR = shadow shadow: runtime pixmaps $(MKDIR_P) $(SHADOWDIR) - cd $(SHADOWDIR); ln -s ../*.[chm] ../*.in ../*.sh ../*.xs ../*.xbm ../gui_gtk_res.xml ../toolcheck ../proto ../libvterm ../vimtutor ../gvimtutor ../install-sh . + cd $(SHADOWDIR); ln -s ../*.[chm] ../*.in ../*.sh ../*.xs ../*.xbm ../gui_gtk_res.xml ../toolcheck ../proto ../libvterm ../vimtutor ../gvimtutor ../install-sh ../Make_all.mak . mkdir $(SHADOWDIR)/auto cd $(SHADOWDIR)/auto; ln -s ../../auto/configure . $(MKDIR_P) $(SHADOWDIR)/po cd $(SHADOWDIR)/po; ln -s ../../po/*.po ../../po/*.mak ../../po/*.vim ../../po/Makefile . cd $(SHADOWDIR); rm -f auto/link.sed cp Makefile configure $(SHADOWDIR) rm -f $(SHADOWDIR)/auto/config.mk $(SHADOWDIR)/config.mk.dist cp config.mk.dist $(SHADOWDIR)/auto/config.mk
Re: [PATCH] Copy Make_all.mak to SHADOWDIR
On Thu, Jul 5, 2018 at 8:06 AM, Elimar Riesebieter wrote: > To build vim in SHADOWDIR we need to copy Make_all.mak as well to > $(SHADOWDIR). > > --- > src/Makefile | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/src/Makefile b/src/Makefile > index 2c4421ee2..016046fd5 100644 > --- a/src/Makefile > +++ b/src/Makefile > @@ -2687,7 +2687,7 @@ shadow: runtime pixmaps > $(MKDIR_P) $(SHADOWDIR)/po > cd $(SHADOWDIR)/po; ln -s ../../po/*.po ../../po/*.mak ../../po/*.vim > ../../po/Makefile . > cd $(SHADOWDIR); rm -f auto/link.sed > - cp Makefile configure $(SHADOWDIR) > + cp Makefile Make_all.mak configure $(SHADOWDIR) > rm -f $(SHADOWDIR)/auto/config.mk $(SHADOWDIR)/config.mk.dist > cp config.mk.dist $(SHADOWDIR)/auto/config.mk > cp config.mk.dist $(SHADOWDIR) > -- > 2.18.0 Since there is no reason a user would modify the Make_all.mak, a link is enough (like for most other sources) -- see attached patch. Best regards, Tony. -- -- You received this message from the "vim_dev" maillist. Do not top-post! Type your reply below the text you are replying to. For more information, visit http://www.vim.org/maillist.php --- You received this message because you are subscribed to the Google Groups "vim_dev" group. To unsubscribe from this group and stop receiving emails from it, send an email to vim_dev+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/d/optout. # HG changeset patch # Parent 5b8606d91016c548240f348191933e0e3527388e Add Make_all.mak to target "shadow" diff --git a/src/Makefile b/src/Makefile --- a/src/Makefile +++ b/src/Makefile @@ -2676,17 +2676,17 @@ clean celan: testclean fi # Make a shadow directory for compilation on another system or with different # features. SHADOWDIR = shadow shadow: runtime pixmaps $(MKDIR_P) $(SHADOWDIR) - cd $(SHADOWDIR); ln -s ../*.[chm] ../*.in ../*.sh ../*.xs ../*.xbm ../gui_gtk_res.xml ../toolcheck ../proto ../libvterm ../vimtutor ../gvimtutor ../install-sh . + cd $(SHADOWDIR); ln -s ../*.[chm] ../*.in ../*.sh ../*.xs ../*.xbm ../gui_gtk_res.xml ../toolcheck ../proto ../libvterm ../vimtutor ../gvimtutor ../install-sh ..Make_all.mak . mkdir $(SHADOWDIR)/auto cd $(SHADOWDIR)/auto; ln -s ../../auto/configure . $(MKDIR_P) $(SHADOWDIR)/po cd $(SHADOWDIR)/po; ln -s ../../po/*.po ../../po/*.mak ../../po/*.vim ../../po/Makefile . cd $(SHADOWDIR); rm -f auto/link.sed cp Makefile configure $(SHADOWDIR) rm -f $(SHADOWDIR)/auto/config.mk $(SHADOWDIR)/config.mk.dist cp config.mk.dist $(SHADOWDIR)/auto/config.mk
[PATCH] Copy Make_all.mak to SHADOWDIR
To build vim in SHADOWDIR we need to copy Make_all.mak as well to $(SHADOWDIR). --- src/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Makefile b/src/Makefile index 2c4421ee2..016046fd5 100644 --- a/src/Makefile +++ b/src/Makefile @@ -2687,7 +2687,7 @@ shadow: runtime pixmaps $(MKDIR_P) $(SHADOWDIR)/po cd $(SHADOWDIR)/po; ln -s ../../po/*.po ../../po/*.mak ../../po/*.vim ../../po/Makefile . cd $(SHADOWDIR); rm -f auto/link.sed - cp Makefile configure $(SHADOWDIR) + cp Makefile Make_all.mak configure $(SHADOWDIR) rm -f $(SHADOWDIR)/auto/config.mk $(SHADOWDIR)/config.mk.dist cp config.mk.dist $(SHADOWDIR)/auto/config.mk cp config.mk.dist $(SHADOWDIR) -- 2.18.0 -- You cannot propel yourself forward by patting yourself on the back. -- -- You received this message from the "vim_dev" maillist. Do not top-post! Type your reply below the text you are replying to. For more information, visit http://www.vim.org/maillist.php --- You received this message because you are subscribed to the Google Groups "vim_dev" group. To unsubscribe from this group and stop receiving emails from it, send an email to vim_dev+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/d/optout.
