thac0/vim
1
0
Fork 0
forked from aniani/vim
Code

Change SKIP_GTK to SKIP_GTK2 in configure.

Browse Source
This commit is contained in:
Bram Moolenaar 2010-07-05 22:57:59 +02:00
parent 0af8cebc6c
commit e667c95335
6 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
runtime/doc/quickfix.txt
View File

@ -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 directory stack (NOT the directory subtree!). If it is still not found, it is
assumed that it is in Vim's current directory. 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". prints information about entering a directory in the form "Making all in dir".
1) Assume you have following directories and files: 1) Assume you have following directories and files:

10
runtime/doc/quickref.txt
View File

@ -1087,15 +1087,19 @@ Context-sensitive completion on the command-line:
|:_%| % current file name (only where a file name is expected) |:_%| % current file name (only where a file name is expected)
|:_#| #[num] alternate file name [num] (only where a file name is |:_#| #[num] alternate file name [num] (only where a file name is
expected) 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 |:<cword>| <cword> word under the cursor (only where a file name is
expected) expected)
|:<cWORD>| <cWORD> WORD under the cursor (only where a file name is |:<cWORD>| <cWORD> WORD under the cursor (only where a file name is
expected) (see |WORD|) expected) (see |WORD|)
|:<cfile>| <cfile> file name under the cursor (only where a file name is |:<cfile>| <cfile> file name under the cursor (only where a file name is
expected) 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 |:<sfile>| <sfile> file name of a ":source"d file, within that file (only
where a file name is expected) where a file name is expected)

2
runtime/doc/todo.txt
View File

@ -1098,6 +1098,8 @@ Vim 7.3:
Use register_shell_extension()? Use register_shell_extension()?
Patch from Geoffrey Reilly, 2010 Jun 22 Patch from Geoffrey Reilly, 2010 Jun 22
- in August remove UF_VERSION_CRYPT_PREV and UF_VERSION_PREV. - 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: Patches to include:
- Patch for Lisp support with ECL (Mikael Jansson, 2008 Oct 25) - Patch for Lisp support with ECL (Mikael Jansson, 2008 Oct 25)
- Gvimext patch to support wide file names. (Szabolcs Horvat 2008 Sep 10) - Gvimext patch to support wide file names. (Szabolcs Horvat 2008 Sep 10)

2
src/auto/configure vendored
View File

@ -7911,7 +7911,7 @@ done
fi 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_save=$CPPFLAGS
CPPFLAGS="$CPPFLAGS $X_CFLAGS" CPPFLAGS="$CPPFLAGS $X_CFLAGS"
for ac_header in X11/xpm.h X11/Sunkeysym.h for ac_header in X11/xpm.h X11/Sunkeysym.h

2
src/configure.in
View File

@ -1876,7 +1876,7 @@ if test "$enable_xsmp" = "yes"; then
fi 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 dnl Check for X11/xpm.h and X11/Sunkeysym.h with the GUI include path
cppflags_save=$CPPFLAGS cppflags_save=$CPPFLAGS
CPPFLAGS="$CPPFLAGS $X_CFLAGS" CPPFLAGS="$CPPFLAGS $X_CFLAGS"

8
src/screen.c
View File

@ -4348,10 +4348,10 @@ win_line(wp, lnum, startrow, endrow, nochange)
#ifdef FEAT_CONCEAL #ifdef FEAT_CONCEAL
if ( wp->w_p_conceal if ( wp->w_p_conceal
&& (!area_highlighting) && !area_highlighting
&& ((lnum != wp->w_cursor.lnum) && (lnum != wp->w_cursor.lnum
|| (curwin != wp) || (wp->w_buffer->b_p_ma == FALSE)) || curwin != wp || wp->w_buffer->b_p_ma == FALSE)
&& ((syntax_flags & HL_CONCEAL) != 0)) && (syntax_flags & HL_CONCEAL) != 0)
{ {
char_attr = conceal_attr; char_attr = conceal_attr;