mirror of
https://github.com/neovim/neovim.git
synced 2025-02-25 18:55:25 -06:00
vim-patch:8.2.4677: the Athena GUI support is outdated
Problem: The Athena GUI support is outdated.
Solution: Remove the Athena GUI code.
0b962e5685
This commit is contained in:
parent
1bced9bf94
commit
477cf2a6b1
@ -64,8 +64,8 @@ func Test_client_server()
|
|||||||
" the GUI and check that the remote command still works.
|
" the GUI and check that the remote command still works.
|
||||||
" Need to wait for the GUI to start up, otherwise the send hangs in trying
|
" Need to wait for the GUI to start up, otherwise the send hangs in trying
|
||||||
" to send to the terminal window.
|
" to send to the terminal window.
|
||||||
if has('gui_athena') || has('gui_motif')
|
if has('gui_motif')
|
||||||
" For those GUIs, ignore the 'failed to create input context' error.
|
" For this GUI ignore the 'failed to create input context' error.
|
||||||
call remote_send(name, ":call test_ignore_error('E285') | gui -f\<CR>")
|
call remote_send(name, ":call test_ignore_error('E285') | gui -f\<CR>")
|
||||||
else
|
else
|
||||||
call remote_send(name, ":gui -f\<CR>")
|
call remote_send(name, ":gui -f\<CR>")
|
||||||
|
@ -1967,7 +1967,7 @@ endfunc
|
|||||||
func Test_edit_CTRL_hat()
|
func Test_edit_CTRL_hat()
|
||||||
CheckFeature xim
|
CheckFeature xim
|
||||||
|
|
||||||
" FIXME: test fails with Athena and Motif GUI.
|
" FIXME: test fails with Motif GUI.
|
||||||
" test also fails when running in the GUI.
|
" test also fails when running in the GUI.
|
||||||
CheckFeature gui_gtk
|
CheckFeature gui_gtk
|
||||||
CheckNotGui
|
CheckNotGui
|
||||||
|
@ -722,7 +722,7 @@ func Test_1_highlight_Normalgroup_exists()
|
|||||||
elseif has('gui_gtk2') || has('gui_gnome') || has('gui_gtk3')
|
elseif has('gui_gtk2') || has('gui_gnome') || has('gui_gtk3')
|
||||||
" expect is DEFAULT_FONT of gui_gtk_x11.c
|
" expect is DEFAULT_FONT of gui_gtk_x11.c
|
||||||
call assert_match('hi Normal\s*font=Monospace 10', hlNormal)
|
call assert_match('hi Normal\s*font=Monospace 10', hlNormal)
|
||||||
elseif has('gui_motif') || has('gui_athena')
|
elseif has('gui_motif')
|
||||||
" expect is DEFAULT_FONT of gui_x11.c
|
" expect is DEFAULT_FONT of gui_x11.c
|
||||||
call assert_match('hi Normal\s*font=7x13', hlNormal)
|
call assert_match('hi Normal\s*font=7x13', hlNormal)
|
||||||
elseif has('win32')
|
elseif has('win32')
|
||||||
|
@ -98,7 +98,7 @@ func Do_test_quotestar_for_x11()
|
|||||||
|
|
||||||
" Running in a terminal and the GUI is available: Tell the server to open
|
" Running in a terminal and the GUI is available: Tell the server to open
|
||||||
" the GUI and check that the remote command still works.
|
" the GUI and check that the remote command still works.
|
||||||
if has('gui_athena') || has('gui_motif')
|
if has('gui_motif')
|
||||||
" For those GUIs, ignore the 'failed to create input context' error.
|
" For those GUIs, ignore the 'failed to create input context' error.
|
||||||
call remote_send(name, ":call test_ignore_error('E285') | gui -f\<CR>")
|
call remote_send(name, ":call test_ignore_error('E285') | gui -f\<CR>")
|
||||||
else
|
else
|
||||||
|
@ -431,7 +431,7 @@ endfunction
|
|||||||
" Test the -reverse and +reverse arguments (for GUI only).
|
" Test the -reverse and +reverse arguments (for GUI only).
|
||||||
func Test_reverse()
|
func Test_reverse()
|
||||||
CheckCanRunGui
|
CheckCanRunGui
|
||||||
CheckAnyOf Feature:gui_gtk Feature:gui_motif Feature:gui_athena
|
CheckAnyOf Feature:gui_gtk Feature:gui_motif
|
||||||
|
|
||||||
let after =<< trim [CODE]
|
let after =<< trim [CODE]
|
||||||
call writefile([&background], "Xtest_reverse")
|
call writefile([&background], "Xtest_reverse")
|
||||||
@ -452,7 +452,7 @@ endfunc
|
|||||||
" Test the -background and -foreground arguments (for GUI only).
|
" Test the -background and -foreground arguments (for GUI only).
|
||||||
func Test_background_foreground()
|
func Test_background_foreground()
|
||||||
CheckCanRunGui
|
CheckCanRunGui
|
||||||
CheckAnyOf Feature:gui_gtk Feature:gui_motif Feature:gui_athena
|
CheckAnyOf Feature:gui_gtk Feature:gui_motif
|
||||||
|
|
||||||
" Is there a better way to check the effect of -background & -foreground
|
" Is there a better way to check the effect of -background & -foreground
|
||||||
" other than merely looking at &background (dark or light)?
|
" other than merely looking at &background (dark or light)?
|
||||||
@ -479,7 +479,7 @@ func Test_font()
|
|||||||
|
|
||||||
if has('gui_gtk')
|
if has('gui_gtk')
|
||||||
let font = 'Courier 14'
|
let font = 'Courier 14'
|
||||||
elseif has('gui_motif') || has('gui_athena')
|
elseif has('gui_motif')
|
||||||
let font = '-misc-fixed-bold-*'
|
let font = '-misc-fixed-bold-*'
|
||||||
else
|
else
|
||||||
throw 'Skipped: test does not set a valid font for this GUI'
|
throw 'Skipped: test does not set a valid font for this GUI'
|
||||||
@ -501,10 +501,10 @@ endfunc
|
|||||||
" Test the -geometry argument (for GUI only).
|
" Test the -geometry argument (for GUI only).
|
||||||
func Test_geometry()
|
func Test_geometry()
|
||||||
CheckCanRunGui
|
CheckCanRunGui
|
||||||
CheckAnyOf Feature:gui_gtk Feature:gui_motif Feature:gui_athena
|
CheckAnyOf Feature:gui_gtk Feature:gui_motif
|
||||||
|
|
||||||
if has('gui_motif') || has('gui_athena')
|
if has('gui_motif')
|
||||||
" FIXME: With GUI Athena or Motif, the value of getwinposx(),
|
" FIXME: With GUI Motif the value of getwinposx(),
|
||||||
" getwinposy() and getwinpos() do not match exactly the
|
" getwinposy() and getwinpos() do not match exactly the
|
||||||
" value given in -geometry. Why?
|
" value given in -geometry. Why?
|
||||||
" So only check &columns and &lines for those GUIs.
|
" So only check &columns and &lines for those GUIs.
|
||||||
@ -533,7 +533,7 @@ endfunc
|
|||||||
" Test the -iconic argument (for GUI only).
|
" Test the -iconic argument (for GUI only).
|
||||||
func Test_iconic()
|
func Test_iconic()
|
||||||
CheckCanRunGui
|
CheckCanRunGui
|
||||||
CheckAnyOf Feature:gui_gtk Feature:gui_motif Feature:gui_athena
|
CheckAnyOf Feature:gui_gtk Feature:gui_motif
|
||||||
|
|
||||||
call RunVim([], [], '-f -g -iconic -cq')
|
call RunVim([], [], '-f -g -iconic -cq')
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user