commit e667c95335ab9e87d08066a257f9de206e031f2b
author Bram Moolenaar <Bram@vim.org> Mon Jul 05 22:57:59 2010 +0200
committer Bram Moolenaar <Bram@vim.org> Mon Jul 05 22:57:59 2010 +0200
tree ced46b0828e3183982afd6a86c9943436fe16eec
parent 0af8cebc6caafddfdc85d36dd01c12bc0a13c13c

Change SKIP_GTK to SKIP_GTK2 in configure.

src/auto/configure

diff --git a/src/auto/configure b/src/auto/configure
index 9688efa..5e0e57a 100755
--- a/src/auto/configure
+++ b/src/auto/configure
@@ -7911,7 +7911,7 @@
 fi
 
 
-if test -z "$SKIP_ATHENA" -o -z "$SKIP_NEXTAW" -o -z "$SKIP_MOTIF" -o -z "$SKIP_GTK"; then
+if test -z "$SKIP_ATHENA" -o -z "$SKIP_NEXTAW" -o -z "$SKIP_MOTIF" -o -z "$SKIP_GTK2"; then
     cppflags_save=$CPPFLAGS
   CPPFLAGS="$CPPFLAGS $X_CFLAGS"
   for ac_header in X11/xpm.h X11/Sunkeysym.h

src/configure.in

diff --git a/src/configure.in b/src/configure.in
index b99bcb8..a18c683 100644
--- a/src/configure.in
+++ b/src/configure.in
@@ -1876,7 +1876,7 @@
 fi
 
 
-if test -z "$SKIP_ATHENA" -o -z "$SKIP_NEXTAW" -o -z "$SKIP_MOTIF" -o -z "$SKIP_GTK"; then
+if test -z "$SKIP_ATHENA" -o -z "$SKIP_NEXTAW" -o -z "$SKIP_MOTIF" -o -z "$SKIP_GTK2"; then
   dnl Check for X11/xpm.h and X11/Sunkeysym.h with the GUI include path
   cppflags_save=$CPPFLAGS
   CPPFLAGS="$CPPFLAGS $X_CFLAGS"

src/screen.c

diff --git a/src/screen.c b/src/screen.c
index a62e6ec..3df7f66 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -4348,10 +4348,10 @@
 
 #ifdef FEAT_CONCEAL
 	    if (    wp->w_p_conceal
-		    && (!area_highlighting)
-		    && ((lnum != wp->w_cursor.lnum)
-			|| (curwin != wp) || (wp->w_buffer->b_p_ma == FALSE))
-		    && ((syntax_flags & HL_CONCEAL) != 0))
+		    && !area_highlighting
+		    && (lnum != wp->w_cursor.lnum
+			|| curwin != wp || wp->w_buffer->b_p_ma == FALSE)
+		    && (syntax_flags & HL_CONCEAL) != 0)
 
 	    {
 		char_attr = conceal_attr;