diff options
| author | Bram Moolenaar <Bram@vim.org> | 2010-07-05 22:57:59 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2010-07-05 22:57:59 +0200 |
| commit | e667c95335ab9e87d08066a257f9de206e031f2b (patch) | |
| tree | ced46b0828e3183982afd6a86c9943436fe16eec /src | |
| parent | 0af8cebc6caafddfdc85d36dd01c12bc0a13c13c (diff) | |
| download | vim-git-e667c95335ab9e87d08066a257f9de206e031f2b.tar.gz | |
Change SKIP_GTK to SKIP_GTK2 in configure.
Diffstat (limited to 'src')
| -rwxr-xr-x | src/auto/configure | 2 | ||||
| -rw-r--r-- | src/configure.in | 2 | ||||
| -rw-r--r-- | src/screen.c | 8 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/auto/configure b/src/auto/configure index 9688efac1..5e0e57ad8 100755 --- a/src/auto/configure +++ b/src/auto/configure @@ -7911,7 +7911,7 @@ done 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 diff --git a/src/configure.in b/src/configure.in index b99bcb8c3..a18c68317 100644 --- a/src/configure.in +++ b/src/configure.in @@ -1876,7 +1876,7 @@ if test "$enable_xsmp" = "yes"; then 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" diff --git a/src/screen.c b/src/screen.c index a62e6ec71..3df7f665d 100644 --- a/src/screen.c +++ b/src/screen.c @@ -4348,10 +4348,10 @@ win_line(wp, lnum, startrow, endrow, nochange) #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; |