Patch 9.0.0034

[Bram Moolenaar]

Patch 9.0.0034
Problem: Spell tests do not always clear the word list.
Solution: Clear the word list in TearDown(). (closes #10659)
Files: src/testdir/test_spell.vim, src/testdir/test_spell_utf8.vim


*** ../vim-9.0.0033/src/testdir/test_spell.vim 2022-07-01 22:26:16.691721005 +0100
--- src/testdir/test_spell.vim 2022-07-04 11:00:13.280220202 +0100
***************
*** 14,19 ****
--- 14,21 ----
call delete('Xtest.latin1.add.spl')
call delete('Xtest.latin1.spl')
call delete('Xtest.latin1.sug')
+ " set 'encoding' to clear the word list
+ set encoding=utf-8
endfunc

func Test_wrap_search()
***************
*** 781,786 ****
--- 783,792 ----
set spl=Xtest_ca.latin1.spl
call assert_equal("elequint", FirstSpellWord())
call assert_equal("elekwint", SecondSpellWord())
+
+ bwipe!
+ set spellfile=
+ set spl&
endfunc

func Test_spellfile_value()
***************
*** 864,872 ****
sil! norm z=

bwipe!
- " clear the internal word list
- set enc=latin1
- set enc=utf-8
endfunc

func LoadAffAndDic(aff_contents, dic_contents)
--- 870,875 ----
*** ../vim-9.0.0033/src/testdir/test_spell_utf8.vim 2022-07-01 22:44:16.650379326 +0100
--- src/testdir/test_spell_utf8.vim 2022-07-04 11:00:13.280220202 +0100
***************
*** 13,18 ****
--- 13,20 ----
call delete('Xtest.utf-8.add.spl')
call delete('Xtest.utf-8.spl')
call delete('Xtest.utf-8.sug')
+ " set 'encoding' to clear the word list
+ set encoding=utf-8
endfunc

let g:test_data_aff1 = [
***************
*** 484,490 ****
\ ]

func LoadAffAndDic(aff_contents, dic_contents)
- set enc=utf-8
set spellfile=
call writefile(a:aff_contents, "Xtest.aff")
call writefile(a:dic_contents, "Xtest.dic")
--- 486,491 ----
***************
*** 759,764 ****
--- 760,766 ----
call assert_equal("elequint", FirstSpellWord())
call assert_equal("elekwint", SecondSpellWord())

+ bwipe!
set spellfile=
set spl&
endfunc
***************
*** 802,809 ****
sil norm z=

bwipe!
- " clear the word list
- set enc=utf-8
call delete('Xtmpfile')
endfunc

--- 804,809 ----
***************
*** 816,822 ****
sil! norm P]svc
norm P]s

- " TODO: should we clear the word list?
bwipe!
endfunc

--- 816,821 ----
*** ../vim-9.0.0033/src/version.c 2022-07-04 10:47:27.893116098 +0100
--- src/version.c 2022-07-04 11:01:20.212150491 +0100
***************
*** 737,738 ****
--- 737,740 ----
{ /* Add new patch number below this line */
+ /**/
+ 34,
/**/

--
The future isn't what it used to be.

/// Bram Moolenaar -- Br...@Moolenaar.net -- http://www.Moolenaar.net \\\
/// \\\
\\\ sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ ///
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///

[Hisashi T Fujinaka]

4dd9252d6f0e93c9118c808bd47f407d581947a8 is the first bad commit
commit 4dd9252d6f0e93c9118c808bd47f407d581947a8
Author: Anton Sharonov <anton.s...@gmail.com>
Date: Mon Jul 4 10:47:31 2022 +0100

patch 9.0.0033: on a Belgian keyboard CTRL-[ does not work

Problem: On a Belgian keyboard CTRL-[ does not work.
Solution: Handle GDK_KEY_dead_circumflex. (Anton Sharonov, closes #10658)

src/gui_gtk_x11.c | 26 ++++++++++++++++++++++++++
src/version.c | 2 ++
2 files changed, 28 insertions(+)

----

This breaks my build on MacOS X with gtk+2.

--
Hisashi T Fujinaka - ht...@twofifty.com
BSEE + BSChem + BAEnglish + MSCS + $2.50 = coffee

[Bram Moolenaar]

> patch 9.0.0033: on a Belgian keyboard CTRL-[ does not work
>
> Problem: On a Belgian keyboard CTRL-[ does not work.
> Solution: Handle GDK_KEY_dead_circumflex. (Anton Sharonov, closes #10658)
>
> src/gui_gtk_x11.c | 26 ++++++++++++++++++++++++++
> src/version.c | 2 ++
> 2 files changed, 28 insertions(+)
>
> ----
>
> This breaks my build on MacOS X with gtk+2.

What is the error?

Can it be fixed with "#ifdef GDK_KEY_dead_circumflex" ?

--
hundred-and-one symptoms of being an internet addict:
44. Your friends no longer send you e-mail...they just log on to your IRC
channel.

[Hisashi T Fujinaka]

On Mon, 4 Jul 2022, Bram Moolenaar wrote:

>
>> patch 9.0.0033: on a Belgian keyboard CTRL-[ does not work
>>
>> Problem: On a Belgian keyboard CTRL-[ does not work.
>> Solution: Handle GDK_KEY_dead_circumflex. (Anton Sharonov, closes #10658)
>>
>> src/gui_gtk_x11.c | 26 ++++++++++++++++++++++++++
>> src/version.c | 2 ++
>> 2 files changed, 28 insertions(+)
>>
>> ----
>>
>> This breaks my build on MacOS X with gtk+2.
>
> What is the error?
>
> Can it be fixed with "#ifdef GDK_KEY_dead_circumflex" ?

Every time I try to file a complete report, I fail. Sorry about that.

gcc -c -I. -Iproto -DHAVE_CONFIG_H -DFEAT_GUI_GTK -I/opt/sw/include/gtk-2.0 -I/opt/sw/lib/gtk-2.0/include -I/opt/sw/include/gtk-2.0 -I/opt/sw/include/pango-1.0 -I/opt/sw/include/atk-1.0 -I/opt/sw/include/cairo -I/opt/sw/include/pango-1.0 -I/opt/sw/include/glib-2.0 -I/opt/sw/lib/glib-2.0/include -I/opt/sw/include/freetype2 -I/opt/sw/include -I/opt/X11/include -MD -I/opt/sw/include -DMACOS_X -g -O2 -I/opt/sw/include -D_REENTRANT -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=1 -I/usr/X11/include -o objects/gui_gtk_x11.o gui_gtk_x11.c
gui_gtk_x11.c:1250:32: error: use of undeclared identifier 'GDK_KEY_dead_circumflex'
if (len == 0 && key_sym == GDK_KEY_dead_circumflex)
^
1 error generated.

And I ifdef'ed out the code and it worked just fine.