Patch 8.1.2101

[Bram Moolenaar]

Patch 8.1.2101
Problem: write_session_file() often defined but not used.
Solution: Adjust the #ifdef. (Yegappan Lakshmanan, closes #4998)
Files: src/session.c


*** ../vim-8.1.2100/src/session.c 2019-09-01 16:01:25.584754569 +0200
--- src/session.c 2019-09-29 19:01:22.884986928 +0200
***************
*** 985,991 ****
}
}

! #if defined(FEAT_GUI) || defined(PROTO)
/*
* Generate a script that can be used to restore the current editing session.
* Save the value of v:this_session before running :mksession in order to make
--- 985,993 ----
}
}

! # if defined(USE_GNOME_SESSION) \
! || (defined(GUI_MAY_SPAWN) && defined(EXPERIMENTAL_GUI_CMD)) \
! || defined(PROTO)
/*
* Generate a script that can be used to restore the current editing session.
* Save the value of v:this_session before running :mksession in order to make
*** ../vim-8.1.2100/src/version.c 2019-09-29 14:23:35.792563008 +0200
--- src/version.c 2019-09-29 19:02:26.556711986 +0200
***************
*** 755,756 ****
--- 755,758 ----
{ /* Add new patch number below this line */
+ /**/
+ 2101,
/**/

--
Windows
M!uqoms

/// Bram Moolenaar -- Br...@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 ///

[Tony Mechelynck]

On Sun, Sep 29, 2019 at 7:03 PM Bram Moolenaar <Br...@moolenaar.net> wrote:
> Patch 8.1.2101
> Problem: write_session_file() often defined but not used.
> Solution: Adjust the #ifdef. (Yegappan Lakshmanan, closes #4998)
> Files: src/session.c

Link error in Huge build (only):

gui_gtk_x11.c:(.text+0x1062): undefined reference to `write_session_file'
collect2: error: ld returned 1 exit status
link.sh: Linking failed
make: *** [Makefile:2081: vim-huge] Error 1

FWIW, here are my "Huge" config arguments:

export CONF_OPT_GUI='--enable-gui=gnome2'
export CONF_OPT_PERL='--enable-perlinterp'
export CONF_OPT_PYTHON='--enable-pythoninterp'
export CONF_OPT_PYTHON3='--disable-python3interp'
export CONF_OPT_TCL='--enable-tclinterp'
# /usr/bin/tclsh (softlink) is correctly set
export CONF_OPT_RUBY='--enable-rubyinterp'
export CONF_OPT_LUA='--enable-luainterp'
export CONF_OPT_MZSCHEME='--disable-mzschemeinterp'
#export CONF_OPT_PLTHOME='--with-plthome=/usr/local/plt'
export CONF_OPT_CSCOPE='--enable-cscope'
export CONF_OPT_MULTIBYTE='--enable-multibyte'
export CONF_OPT_TERMINAL='--enable-terminal'
export CONF_OPT_AUTOSERVE='--enable-autoservername'
export CONF_OPT_FEAT='--with-features=huge'
export CONF_ARGS2='--with-vim-name=vim-huge'
export CONF_OPT_COMPBY='"--with-compiledby=antoine.m...@gmail.com"'


Best regards,
Tony.

[Yegappan Lakshmanan]

Hi Tony,

On Sun, Sep 29, 2019 at 10:22 AM Tony Mechelynck
<antoine.m...@gmail.com> wrote:
>
> On Sun, Sep 29, 2019 at 7:03 PM Bram Moolenaar <Br...@moolenaar.net> wrote:
> > Patch 8.1.2101
> > Problem: write_session_file() often defined but not used.
> > Solution: Adjust the #ifdef. (Yegappan Lakshmanan, closes #4998)
> > Files: src/session.c
>
> Link error in Huge build (only):
>
> gui_gtk_x11.c:(.text+0x1062): undefined reference to `write_session_file'
> collect2: error: ld returned 1 exit status
> link.sh: Linking failed
> make: *** [Makefile:2081: vim-huge] Error 1
>

Thanks for reporting the issue. Can you try the attached patch?

Thanks,
Yegappan

[Tony Mechelynck]

With this patch, I see no error. For the record, I'm attaching the
patch as Mercurial wrote it in a new mq queue created for the purpose.

Best regards,
Tony.