diff --git a/runtime/doc/quickfix.txt b/runtime/doc/quickfix.txt
index e0e315e17141bfbd767f04efda5e662c31795f6a..18ca1c7877db66c30fef3010d7b14df2d9521618 100644
--- a/runtime/doc/quickfix.txt
+++ b/runtime/doc/quickfix.txt
@@ -1230,7 +1230,7 @@ identified directory.  If not, it is searched in all other directories of the
 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 8baeaaebfa587cd0d42e14d8e99d1c82866a8a66..c2b4bfef8d9ff11656ebece9358da1967b8f1eb1 100644
--- a/runtime/doc/quickref.txt
+++ b/runtime/doc/quickref.txt
@@ -1087,15 +1087,19 @@ Context-sensitive completion on the command-line:
 |:_%|	    %		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 2324d73c60aae5c3503e525da4aab427448f5a2f..ea70246f73acd6247a50ccf514901cbd8ce75cb4 100644
--- a/runtime/doc/todo.txt
+++ b/runtime/doc/todo.txt
@@ -1098,6 +1098,8 @@ Vim 7.3:
    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 9688efac124be09e93de6bdcedbf23ac291be55b..5e0e57ad868cd40e8c220322d2245d21cd3d4e7d 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 b99bcb8c34fb3835c85cc8cd1ebb8df8475dbea6..a18c68317b6cd6f749e02c9897f2403ec5c3c52f 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 a62e6ec7151fe1175094db5fa335d0fc3ad7cf5d..3df7f665d3123436b85405af3171c72d2c2481b8 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;