Mercurial > vim

changeset 1154:f23b876b21ff

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
updated for version 7.1a
author vimboss
date Sun, 06 May 2007 13:26:41 +0000
parents fb8f2e3e798c
children e6c2f5b32421
files runtime/doc/autocmd.txt runtime/tutor/tutor.vim src/configure.in
diffstat 3 files changed, 67 insertions(+), 21 deletions(-) [+]
line wrap: on
line diff
--- a/runtime/doc/autocmd.txt
+++ b/runtime/doc/autocmd.txt
@@ -1,4 +1,4 @@
-*autocmd.txt*   For Vim version 7.0.  Last change: 2007 Jan 16
+*autocmd.txt*   For Vim version 7.1a.  Last change: 2007 Mar 27
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -263,7 +263,7 @@ Name			triggered by ~
 	Startup and exit
 |VimEnter|		after doing all the startup stuff
 |GUIEnter|		after starting the GUI successfully
-|TermResponse|		after the termainal response to |t_RV| is received
+|TermResponse|		after the terminal response to |t_RV| is received
 
 |VimLeavePre|		before exiting Vim, before writing the viminfo file
 |VimLeave|		before exiting Vim, after writing the viminfo file
@@ -461,6 +461,9 @@ CursorHold			When the user doesn't press
 				make some coffee. :)  See |CursorHold-example|
 				for previewing tags.
 				This event is only triggered in Normal mode.
+				It is not triggered when waiting for a command
+				argument to be typed, or a movement after an
+				operator.
 				While recording the CursorHold event is not
 				triggered. |q|
 				Note: Interactive commands cannot be used for
@@ -528,8 +531,6 @@ FileChangedShell		When Vim notices that 
 				and the buffer was not changed.  If a
 				FileChangedShell autocommand is present the
 				warning message and prompt is not given.
-				This is useful for reloading related buffers
-				which are affected by a single command.
 				The |v:fcs_reason| variable is set to indicate
 				what happened and |v:fcs_choice| can be used
 				to tell Vim what to do next.
@@ -561,7 +562,8 @@ FileReadPost			After reading a file with
 							*FileReadPre*
 FileReadPre			Before reading a file with a ":read" command.
 							*FileType*
-FileType			When the 'filetype' option has been set.
+FileType			When the 'filetype' option has been set.  The
+				pattern is matched against the filetype.
 				<afile> can be used for the name of the file
 				where this option was set, and <amatch> for
 				the new value of 'filetype'.
@@ -617,8 +619,9 @@ FocusLost			When Vim lost input focus.  
 							*FuncUndefined*
 FuncUndefined			When a user function is used but it isn't
 				defined.  Useful for defining a function only
-				when it's used.  Both <amatch> and <afile> are
-				set to the name of the function.
+				when it's used.  The pattern is matched
+				against the function name.  Both <amatch> and
+				<afile> are set to the name of the function.
 				See |autoload-functions|.
 							*GUIEnter*
 GUIEnter			After starting the GUI successfully, and after
@@ -626,6 +629,12 @@ GUIEnter			After starting the GUI succes
 				VimEnter when using gvim.  Can be used to
 				position the window from a .gvimrc file: >
 	:autocmd GUIEnter * winpos 100 50
+<							*GUIFailed*
+GUIFailed			After starting the GUI failed.  Vim may
+				continue to run in the terminal, if possible
+				(only on Unix and alikes, when connecting the
+				X server fails).  You may want to quit Vim: >
+	:autocmd GUIFailed * qall
 <							*InsertChange*
 InsertChange			When typing <Insert> while in Insert or
 				Replace mode.  The |v:insertmode| variable
@@ -633,8 +642,8 @@ InsertChange			When typing <Insert> whil
 				Be careful not to move the cursor or do
 				anything else that the user does not expect.
 							*InsertEnter*
-InsertEnter			When starting Insert mode.  Also for Replace
-				mode and Virtual Replace mode.  The
+InsertEnter			Just before starting Insert mode.  Also for
+				Replace mode and Virtual Replace mode.  The
 				|v:insertmode| variable indicates the mode.
 				Be careful not to move the cursor or do
 				anything else that the user does not expect.
@@ -657,7 +666,7 @@ MenuPopup			Just before showing the popu
 QuickFixCmdPre			Before a quickfix command is run (|:make|,
 				|:lmake|, |:grep|, |:lgrep|, |:grepadd|,
 				|:lgrepadd|, |:vimgrep|, |:lvimgrep|,
-				|:vimgrepadd|, |:vimgrepadd|). The pattern is
+				|:vimgrepadd|, |:lvimgrepadd|). The pattern is
 				matched against the command being run.  When
 				|:grep| is used but 'grepprg' is set to
 				"internal" it still matches "grep".
@@ -671,7 +680,8 @@ QuickFixCmdPost			Like QuickFixCmdPre, b
 				location.
 							*RemoteReply*
 RemoteReply			When a reply from a Vim that functions as
-				server was received |server2client()|.
+				server was received |server2client()|.  The
+				pattern is matched against the {serverid}.
 				<amatch> is equal to the {serverid} from which
 				the reply was sent, and <afile> is the actual
 				reply string.
@@ -735,7 +745,8 @@ SwapExists			Detected an existing swap f
 				Note: Do not try to change the buffer, the
 				results are unpredictable.
 							*Syntax*
-Syntax				When the 'syntax' option has been set.
+Syntax				When the 'syntax' option has been set.  The
+				pattern is matched against the syntax name.
 				<afile> can be used for the name of the file
 				where this option was set, and <amatch> for
 				the new value of 'syntax'.
--- a/runtime/tutor/tutor.vim
+++ b/runtime/tutor/tutor.vim
@@ -1,6 +1,6 @@
 " Vim tutor support file
 " Author: Eduardo F. Amatria <eferna1@platea.pntic.mec.es>
-" Last Change:	2006 Sep 09
+" Last Change:	2007 Mar 01
 
 " This small source file is used for detecting if a translation of the
 " tutor file exist, i.e., a tutor.xx file, where xx is the language.
@@ -35,6 +35,8 @@ else
       let s:ext = ".pl"
     elseif s:lang =~ "Slovak"
       let s:ext = ".sk"
+    elseif s:lang =~ "Czech"
+      let s:ext = ".cs"
     elseif s:lang =~ "Dutch"
       let s:ext = ".nl"
     else
@@ -105,9 +107,22 @@ if s:ext =~? '\.gr\|\.el'
   endif
 endif
 
-" The Slovak tutor is available in two encodings, guess which one to use
-if s:ext =~? '\.sk' && &enc =~ 1250
-  let s:ext = ".sk.cp1250"
+" The Slovak tutor is available in three encodings, guess which one to use
+if s:ext =~? '\.sk'
+  if &enc == 'utf-8'
+    let s:ext = ".sk.utf-8"
+  elseif &enc =~ 1250
+    let s:ext = ".sk.cp1250"
+  endif
+endif
+
+" The Czech tutor is available in three encodings, guess which one to use
+if s:ext =~? '\.cs'
+  if &enc == 'utf-8'
+    let s:ext = ".cs.utf-8"
+  elseif &enc =~ 1250
+    let s:ext = ".cs.cp1250"
+  endif
 endif
 
 " The Russian tutor is available in three encodings, guess which one to use.
@@ -121,6 +136,15 @@ if s:ext =~? '\.ru'
   endif
 endif
 
+" The Hungarian tutor is available in two encodings, guess which one to use.
+if s:ext =~? '\.hu'
+  if &enc == 'utf-8'
+    let s:ext = '.hu.utf-8'
+  elseif &enc =~ 'iso-8859-2'
+    let s:ext = '.hu'
+  endif
+endif
+
 " Somehow ".ge" (Germany) is sometimes used for ".de" (Deutsch).
 if s:ext =~? '\.ge'
   let s:ext = ".de"
--- a/src/configure.in
+++ b/src/configure.in
@@ -404,13 +404,21 @@ if test "$enable_mzschemeinterp" = "yes"
     fi
   fi
 
+  SCHEME_INC=
   if test "X$vi_cv_path_mzscheme_pfx" != "X"; then
     AC_MSG_CHECKING(if scheme.h can be found in $vi_cv_path_mzscheme_pfx/include)
     if test -f $vi_cv_path_mzscheme_pfx/include/scheme.h; then
       AC_MSG_RESULT("yes")
     else
       AC_MSG_RESULT("no")
-      vi_cv_path_mzscheme_pfx=
+      AC_MSG_CHECKING(if scheme.h can be found in $vi_cv_path_mzscheme_pfx/plt/include)
+      if test -f $vi_cv_path_mzscheme_pfx/include/plt/scheme.h; then
+	AC_MSG_RESULT("yes")
+	SCHEME_INC=/plt
+      else
+	AC_MSG_RESULT("no")
+	vi_cv_path_mzscheme_pfx=
+      fi
     fi
   fi
 
@@ -428,8 +436,11 @@ if test "$enable_mzschemeinterp" = "yes"
 	MZSCHEME_LIBS="$MZSCHEME_LIBS -R ${vi_cv_path_mzscheme_pfx}/lib"
       fi
     fi
-    MZSCHEME_CFLAGS="-I${vi_cv_path_mzscheme_pfx}/include   \
-      -DMZSCHEME_COLLECTS='\"${vi_cv_path_mzscheme_pfx}/collects\"'"
+    if test -d $vi_cv_path_mzscheme_pfx/lib/plt/collects; then
+      SCHEME_COLLECTS=lib/plt/
+    fi
+    MZSCHEME_CFLAGS="-I${vi_cv_path_mzscheme_pfx}/include${SCHEME_INC}   \
+      -DMZSCHEME_COLLECTS='\"${vi_cv_path_mzscheme_pfx}/${SCHEME_COLLECTS}collects\"'"
     MZSCHEME_SRC="if_mzsch.c"
     MZSCHEME_OBJ="objects/if_mzsch.o"
     MZSCHEME_PRO="if_mzsch.pro"
@@ -508,8 +519,8 @@ if test "$enable_perlinterp" = "yes"; th
       LDFLAGS=$ldflags_save
       if test $perl_ok = yes; then
 	if test "X$perlcppflags" != "X"; then
-	  dnl remove -pipe, it confuses cproto
-	  PERL_CFLAGS=`echo "$perlcppflags" | sed 's/-pipe //'`
+	  dnl remove -pipe and -Wxxx, it confuses cproto
+	  PERL_CFLAGS=`echo "$perlcppflags" | sed -e 's/-pipe //' -e 's/-W[[^ ]]*//'`
 	fi
 	if test "X$perlldflags" != "X"; then
 	  LDFLAGS="$perlldflags $LDFLAGS"