updated for version 7.0030

diff --git a/runtime/lang/menu_pl_pl.utf-8.vim b/runtime/lang/menu_pl_pl.utf-8.vim
index b7e1d228b854250ca95db63182113096f13205dc..3e93d1e63f8312067c1c190dded7e8a8e157689e 100644 (file)
--- a/runtime/lang/menu_pl_pl.utf-8.vim
+++ b/runtime/lang/menu_pl_pl.utf-8.vim
@@ -1,6 +1,6 @@
 " Menu Translations:   Polish
 " Maintainer:          Rafal M. Sulejman <rms@poczta.onet.pl>
-" Initial Translation: Marcin Dalecki <dalecki@cs.net.pl>
+" Initial Translation: Marcin Dalecki <martin@dalecki.de>
 " Last Change: 06 Sep 2001
 
 " Quit when menu translations have already been done.

diff --git a/src/feature.h b/src/feature.h
index 7e4ddd52b43aa99a6d1013ee7bd436546a87194d..f82bf75ab937a24c5a3c4cbda83519a8df8f8972 100644 (file)
--- 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 fce731b9a07fc2681e3c20a86d7fc317bc5f72fa..5e1b1546f74a9e28c111f022e80d0f038a6b971f 100644 (file)
--- a/src/os_unix.c
+++ b/src/os_unix.c
@@ -1886,11 +1886,6 @@ mch_settitle(title, icon)
     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 @@ mch_settitle(title, icon)
 # 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 @@ mch_exit(r)
     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__