updated for version 7.0030

4 files changed, 34 insertions, 47 deletions

diff --git a/src/configure.in b/src/configure.in
index 16bbf1328c..c3176df880 100644
--- a/src/configure.in
+++ b/src/configure.in
@@ -1091,23 +1091,10 @@ SKIP_MOTIF=YES
 SKIP_ATHENA=YES
 SKIP_NEXTAW=YES
 SKIP_PHOTON=YES
-SKIP_BEOS=YES
 SKIP_CARBON=YES
 GUITYPE=NONE
 
-if test "x$BEOS" = "xyes"; then
-  SKIP_BEOS=
-  case "$enable_gui_canon" in
-    no)		AC_MSG_RESULT(no GUI support)
-		SKIP_BEOS=YES ;;
-    yes|"")	AC_MSG_RESULT(yes - automatic GUI support) ;;
-    auto)	AC_MSG_RESULT(auto - automatic GUI support) ;;
-    beos)	AC_MSG_RESULT(BeOS GUI support) ;;
-    *)		AC_MSG_RESULT([Sorry, $enable_gui GUI is not supported])
-		SKIP_BEOS=YES ;;
-  esac
-
-elif test "x$QNX" = "xyes" -a "x$with_x" = "xno" ; then
+if test "x$QNX" = "xyes" -a "x$with_x" = "xno" ; then
   SKIP_PHOTON=
   case "$enable_gui_canon" in
     no)		AC_MSG_RESULT(no GUI support)
@@ -1574,7 +1561,6 @@ if test "x$MACOSX" = "xyes" -a -z "$SKIP_CARBON" -a "x$CARBON" = "xyes"; then
   SKIP_ATHENA=YES;
   SKIP_NEXTAW=YES;
   SKIP_PHOTON=YES;
-  SKIP_BEOS=YES;
   SKIP_CARBON=YES
 fi
 
@@ -2158,11 +2144,6 @@ if test "x$GUITYPE:$enable_fontset" = "xKDE:yes"; then
   enable_fontset="no"
 fi
 
-dnl There is no test for the BeOS GUI, if it's selected it's used
-if test -z "$SKIP_BEOS"; then
-  GUITYPE=BEOSGUI
-fi
-
 if test -z "$SKIP_PHOTON"; then
   GUITYPE=PHOTONGUI
 fi
diff --git a/src/po/pl.cp1250.po b/src/po/pl.cp1250.po
index f569ae6bbe..ccc1ea3540 100644
--- a/src/po/pl.cp1250.po
+++ b/src/po/pl.cp1250.po
@@ -2,7 +2,7 @@
 # Polish Translation for Vim
 #
 # updated 2001 for vim-6.0
-# FIRST AUTHOR Marcin Dalecki <dalecki@cyber.cs.net.pl>, 2000.
+# FIRST AUTHOR Marcin Dalecki <martin@dalecki.de>, 2000.
 # Mikolaj Machowski <mikmach@wp.pl>, 2004.
 #
 msgid ""
diff --git a/src/screen.c b/src/screen.c
index 11b4dcc5fa..ef7a87f9d7 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -6475,10 +6475,6 @@ screenalloc(clear)
 
     win_new_shellsize();    /* fit the windows in the new sized shell */
 
-#ifdef FEAT_GUI_BEOS
-    vim_lock_screen();  /* be safe, put it here */
-#endif
-
     comp_col();		/* recompute columns for shown command and ruler */
 
     /*
@@ -6692,9 +6688,6 @@ screenalloc(clear)
     }
 #endif
 
-#ifdef FEAT_GUI_BEOS
-    vim_unlock_screen();
-#endif
     entered = FALSE;
 }
 
@@ -7526,9 +7519,6 @@ screen_ins_lines(off, row, line_count, end, wp)
 	clip_scroll_selection(-line_count);
 #endif
 
-#ifdef FEAT_GUI_BEOS
-    vim_lock_screen();
-#endif
 #ifdef FEAT_GUI
     /* Don't update the GUI cursor here, ScreenLines[] is invalid until the
      * scrolling is actually carried out. */
@@ -7580,9 +7570,6 @@ screen_ins_lines(off, row, line_count, end, wp)
 		lineinvalid(temp, (int)Columns);
 	}
     }
-#ifdef FEAT_GUI_BEOS
-    vim_unlock_screen();
-#endif
 
     screen_stop_highlight();
     windgoto(cursor_row, 0);
@@ -7754,9 +7741,6 @@ screen_del_lines(off, row, line_count, end, force, wp)
 	clip_scroll_selection(line_count);
 #endif
 
-#ifdef FEAT_GUI_BEOS
-    vim_lock_screen();
-#endif
 #ifdef FEAT_GUI
     /* Don't update the GUI cursor here, ScreenLines[] is invalid until the
      * scrolling is actually carried out. */
@@ -7815,9 +7799,6 @@ screen_del_lines(off, row, line_count, end, force, wp)
 		lineinvalid(temp, (int)Columns);
 	}
     }
-#ifdef FEAT_GUI_BEOS
-    vim_unlock_screen();
-#endif
 
     screen_stop_highlight();
 
diff --git a/src/testdir/test30.ok b/src/testdir/test30.ok
index c294483bdd..380ce67061 100644
--- a/src/testdir/test30.ok
+++ b/src/testdir/test30.ok
@@ -2,95 +2,120 @@ unix
 unix
 dos

 dos

+END
 mac
mac

+END
 1
 unix

 unix

+END
 dos

 dos

+END
 mac
mac


+END
 2
 unix
 unix
-
dos

+
END
 dos

-
mac
mac
3
+dos

+
END
+mac
mac
END
+3
 unix
 unix
 dos

 dos

 mac
mac

+END
 unix

 unix

 dos

 dos

 mac
mac


+END
 unix
 unix
 dos

 dos

-mac
mac
4
+mac
mac
END
+4
 unix
 unix
 dos

 dos

 mac
mac

+END
 unix
 unix
 mac
mac

+END
 dos

 dos

 mac
mac


+END
 5
 unix
 unix
 dos

 dos

+END
 unix
 unix
 dos

 dos

 mac
mac

+END
 dos

 dos

-mac
mac
6
+mac
mac
END
+6
 unix

 unix

 dos

 dos

+END
 unix

 unix

 mac
mac


+END
 unix

 unix

 dos

 dos

 mac
mac


+END
 7
 unix
 unix
 dos

 dos

 mac
mac

+END
 8
 unix
 unix
 dos

 dos

 mac
mac

+END
 9
 unix
 unix
 dos

 dos

-mac
mac
unix
+mac
mac
END
+unix
 unix
 dos

 dos

-mac
mac
unix
+mac
mac
END
+unix
 unix
 dos

 dos

-mac
mac
10
+mac
mac
END
+10
 unix
 unix