From e667c95335ab9e87d08066a257f9de206e031f2b Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Mon, 5 Jul 2010 22:57:59 +0200 Subject: [PATCH] Change SKIP_GTK to SKIP_GTK2 in configure. --- runtime/doc/quickfix.txt | 2 +- runtime/doc/quickref.txt | 10 +++++++--- runtime/doc/todo.txt | 2 ++ src/auto/configure | 2 +- src/configure.in | 2 +- src/screen.c | 8 ++++---- 6 files changed, 16 insertions(+), 10 deletions(-) diff --git a/runtime/doc/quickfix.txt b/runtime/doc/quickfix.txt index e0e315e17..18ca1c787 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 8baeaaebf..c2b4bfef8 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! +|:| buffer number, for use in an autocommand (only where a + file name is expected) +|:| file name, for user in an autocommand (only where a + file name is expected) +|:| what matched with the pattern, for use in an + autocommand (only where a file name is expected) |:| word under the cursor (only where a file name is expected) |:| WORD under the cursor (only where a file name is expected) (see |WORD|) |:| file name under the cursor (only where a file name is expected) -|:| file name for autocommand (only where a file name is - expected) |:| 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 2324d73c6..ea70246f7 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 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; -- 2.50.1