updated for version 7.0030
diff --git a/src/feature.h b/src/feature.h
index 7e4ddd5..f82bf75 100644
--- a/src/feature.h
+++ b/src/feature.h
@@ -976,7 +976,7 @@
* +mouse Any mouse support (any of the above enabled).
*/
/* OS/2 and Amiga console have no mouse support */
-#if (!defined(AMIGA) && !defined(OS2) && !defined(MACOS)) || defined(FEAT_GUI_AMIGA)
+#if (!defined(AMIGA) && !defined(OS2) && !defined(MACOS))
# ifdef FEAT_NORMAL
# define FEAT_MOUSE_XTERM
# endif
diff --git a/src/os_unix.c b/src/os_unix.c
index fce731b..5e1b154 100644
--- a/src/os_unix.c
+++ b/src/os_unix.c
@@ -1886,11 +1886,6 @@
if (gui.in_use)
type = 1;
# endif
-# ifdef FEAT_GUI_BEOS
- /* TODO: If this means (gui.in_use) why not merge with above? (Dany) */
- /* we always have a 'window' */
- type = 1;
-# endif
#endif
/*
@@ -1920,7 +1915,7 @@
# endif
set_x11_title(title); /* x11 */
#endif
-#if defined(FEAT_GUI_GTK) || defined(FEAT_GUI_BEOS) \
+#if defined(FEAT_GUI_GTK) \
|| defined(FEAT_GUI_PHOTON) || defined(FEAT_GUI_MAC)
else
gui_mch_settitle(title, icon);
@@ -2762,9 +2757,7 @@
ml_close_all(TRUE); /* remove all memfiles */
may_core_dump();
#ifdef FEAT_GUI
-# ifndef FEAT_GUI_BEOS /* BeOS always has GUI */
if (gui.in_use)
-# endif
gui_exit(r);
#endif
#ifdef __QNX__