Change SKIP_GTK to SKIP_GTK2 in configure.
diff --git a/runtime/doc/quickfix.txt b/runtime/doc/quickfix.txt
index e0e315e..18ca1c7 100644
--- a/runtime/doc/quickfix.txt
+++ b/runtime/doc/quickfix.txt
@@ -1230,7 +1230,7 @@
directory stack (NOT the directory subtree!). If it is still not found, it is
assumed that it is in Vim's current directory.
-There are limitations in this algorithm. This examples assume that make just
+There are limitations in this algorithm. These examples assume that make just
prints information about entering a directory in the form "Making all in dir".
1) Assume you have following directories and files:
diff --git a/runtime/doc/quickref.txt b/runtime/doc/quickref.txt
index 8baeaae..c2b4bfe 100644
--- a/runtime/doc/quickref.txt
+++ b/runtime/doc/quickref.txt
@@ -1087,15 +1087,19 @@
|:_%| % current file name (only where a file name is expected)
|:_#| #[num] alternate file name [num] (only where a file name is
expected)
- Note: The next four are typed literally; these are not special keys!
+ Note: The next five are typed literally; these are not special keys!
+|:<afile>| <abuf> buffer number, for use in an autocommand (only where a
+ file name is expected)
+|:<afile>| <afile> file name, for user in an autocommand (only where a
+ file name is expected)
+|:<afile>| <amatch> what matched with the pattern, for use in an
+ autocommand (only where a file name is expected)
|:<cword>| <cword> word under the cursor (only where a file name is
expected)
|:<cWORD>| <cWORD> WORD under the cursor (only where a file name is
expected) (see |WORD|)
|:<cfile>| <cfile> file name under the cursor (only where a file name is
expected)
-|:<afile>| <afile> file name for autocommand (only where a file name is
- expected)
|:<sfile>| <sfile> file name of a ":source"d file, within that file (only
where a file name is expected)
diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt
index 2324d73..ea70246 100644
--- a/runtime/doc/todo.txt
+++ b/runtime/doc/todo.txt
@@ -1098,6 +1098,8 @@
Use register_shell_extension()?
Patch from Geoffrey Reilly, 2010 Jun 22
- in August remove UF_VERSION_CRYPT_PREV and UF_VERSION_PREV.
+- Conceal feature: no update when moving to another window. (Dominique Pelle,
+ 2010 Jul 5)
Patches to include:
- Patch for Lisp support with ECL (Mikael Jansson, 2008 Oct 25)
- Gvimext patch to support wide file names. (Szabolcs Horvat 2008 Sep 10)
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
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"
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;