diff options
| -rw-r--r-- | runtime/doc/syntax.txt | 7 | ||||
| -rw-r--r-- | runtime/doc/tags | 3 | ||||
| -rw-r--r-- | runtime/doc/todo.txt | 11 | ||||
| -rw-r--r-- | runtime/doc/version7.txt | 42 | ||||
| -rw-r--r-- | src/Makefile | 6 | ||||
| -rw-r--r-- | src/version.h | 10 |
6 files changed, 55 insertions, 24 deletions
diff --git a/runtime/doc/syntax.txt b/runtime/doc/syntax.txt index 9ece274ee..941147769 100644 --- a/runtime/doc/syntax.txt +++ b/runtime/doc/syntax.txt @@ -1599,6 +1599,13 @@ may be changed by the user if s/he is experiencing synchronization difficulties (such as may happen with large lex files). +LIFELINES *lifelines.vim* *ft-lifelines-syntax* + +To highlight deprecated functions as errors, add in your .vimrc: > + + :let g:lifelines_deprecated = 1 +< + LISP *lisp.vim* *ft-lisp-syntax* The lisp syntax highlighting provides two options: > diff --git a/runtime/doc/tags b/runtime/doc/tags index 9dcbaf1e2..004f3ce64 100644 --- a/runtime/doc/tags +++ b/runtime/doc/tags @@ -5583,6 +5583,7 @@ ft-javascript-omni insert.txt /*ft-javascript-omni* ft-ksh-syntax syntax.txt /*ft-ksh-syntax* ft-lace-syntax syntax.txt /*ft-lace-syntax* ft-lex-syntax syntax.txt /*ft-lex-syntax* +ft-lifelines-syntax syntax.txt /*ft-lifelines-syntax* ft-lisp-syntax syntax.txt /*ft-lisp-syntax* ft-lite-syntax syntax.txt /*ft-lite-syntax* ft-lpc-syntax syntax.txt /*ft-lpc-syntax* @@ -6417,6 +6418,7 @@ libcall() eval.txt /*libcall()* libcallnr() eval.txt /*libcallnr()* license uganda.txt /*license* lid quickfix.txt /*lid* +lifelines.vim syntax.txt /*lifelines.vim* limits vi_diff.txt /*limits* line() eval.txt /*line()* line-continuation repeat.txt /*line-continuation* @@ -8298,6 +8300,7 @@ vt100-function-keys term.txt /*vt100-function-keys* w motion.txt /*w* w32-clientserver remote.txt /*w32-clientserver* w:current_syntax syntax.txt /*w:current_syntax* +w:quickfix_title quickfix.txt /*w:quickfix_title* w:var eval.txt /*w:var* warningmsg-variable eval.txt /*warningmsg-variable* white-space pattern.txt /*white-space* diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt index b89c25fab..f7f4d3752 100644 --- a/runtime/doc/todo.txt +++ b/runtime/doc/todo.txt @@ -30,21 +30,14 @@ be worked on, but only if you sponsor Vim development. See |sponsor|. *known-bugs* -------------------- Known bugs and current work ----------------------- -6 In the quickfix window statusline add the command used to get the list of - errors, e.g. ":make foo", ":grep something *.c". - New patch 2010 Jul 24 - Docs patch by Dominique Pelle, Mar 25 included? - Patch for :find completion. (Nazri Ramliy) -But I prefer to keep term.h and include/term.h He will work on it. +But I prefer to keep term.h and include/term.h Nazri will work on it. -Add hg changes to version7.txt +Move more common code from if_python.c and if_python3.c to if_py_both.h Before release 7.3: - Rename vim73 branch to default (hints: Xavier de Gaye, 2010 May 23) -Move more common code from if_python.c and if_python3.c to if_py_both.h - Cursor positioning wrong with 0x200e character. (John Becket, 2010 May 6) Test 69 breaks on MS-Windows, both 32 and 64 builds. (George Reilly, 2010 Feb diff --git a/runtime/doc/version7.txt b/runtime/doc/version7.txt index ee2c4dd32..83349dc22 100644 --- a/runtime/doc/version7.txt +++ b/runtime/doc/version7.txt @@ -7158,8 +7158,8 @@ VERSION 7.3 *version-7.3* *version7.3* This section is about improvements made between version 7.2 and 7.3. -This is a bug-fix release and there are a few new features. -The most notable new features are: +This release has hundreds of bug fixes and there are a few new features. The +most notable new features are: Persistent undo *new-persistent-undo* @@ -7167,12 +7167,13 @@ Persistent undo *new-persistent-undo* Store undo information in a file. Can undo to before when the file was read, also for unloaded buffers. See |undo-persistence| (partly by Jordan Lewis) -Added ":earlier 1f" and ":later 1f". -Add file save counter to undo information. + +Added the ":earlier 1f" and ":later 1f" commands. +Added file save counter to undo information. Added the |undotree()| and |undofile()| functions. Also added the 'undoreload' option. This makes it possible to save the -current text when reloading the buffer, so that it can be undone. +current text when reloading the buffer, so that the reload can be undone. More encryption *new-more-encryption* @@ -7190,10 +7191,14 @@ Conceal text *new-conceal* Added the |+conceal| feature. (Vince Negri) This allows hiding stretches of text, based on syntax highlighting. It also allows replacing a stretch of text by a character |:syn-cchar|. -The 'conceallevel' option specifies what happens. +The 'conceallevel' option specifies what happens with text matching a syntax +item that has the conceal attribute. +The 'concealcursor' option specifies what happens in the cursor line. The help files conceal characters used to mark tags and examples. +Added the |synconcealed()| function and use it for :TOhtml. (Benjamin Fritz) + Lua interface *new-lua* ------------- @@ -7307,12 +7312,19 @@ Support wide file names in gvimext. (Szabolcs Horvat) Improve test for joining lines. (Milan Vancura) Make joining a range of lines much faster. (Milan Vancura) -Command line completion for :ownsyntax. (Dominique Pelle) +Command line completion for :ownsyntax and :setfiletype. (Dominique Pelle) + +Command line completion for :lmap and :lunmap. Add patch to improve support of z/OS (OS/390). (Ralf Schandl) Added the helphelp.txt file. Moved text from various.txt to it. +Added "q" item for 'statusline'. Added |w:quickfix_title|. (Lech Lorens) + +Added support for horizontal scroll wheel. (Bjorn Winckler) + + New syntax files: Haskell Cabal build file (Vincent Berthoux) @@ -10037,5 +10049,21 @@ usage. When 'searchhl' causes a hang make CTRL-C disable 'searchhl'. +When resetting both 'title' and 'icon' the title would be set after a shell +command. + +Reset 'title' and 'icon' in test47 to avoid the xterm title getting messed up. + +Fix for compiler warning about function prototype in pty.c. + +Added 'window' to the options window. + +Fixed: errors for allocating zero bytes when profiling an empty function. + +Remove -arch flag from build flags for Perl. (Bjorn Wickler) + +Fix 'autochdir' not showing up in :options window. (Dominique Pelle) + + vim:tw=78:ts=8:ft=help:norl: diff --git a/src/Makefile b/src/Makefile index f9120938c..a8991bc14 100644 --- a/src/Makefile +++ b/src/Makefile @@ -409,7 +409,7 @@ CClink = $(CC) # If both python2.x and python3.x are enabled then the linking will be via # dlopen(), dlsym(), dlclose(), i.e. pythonX.Y.so must be available #CONF_OPT_PYTHON = --enable-pythoninterp -CONF_OPT_PYTHON3 = --enable-python3interp +#CONF_OPT_PYTHON3 = --enable-python3interp # RUBY # Uncomment this when you want to include the Ruby interface. @@ -3024,11 +3024,11 @@ objects/if_perlsfio.o: if_perlsfio.c vim.h auto/config.h feature.h os_unix.h \ objects/if_python.o: if_python.c vim.h auto/config.h feature.h os_unix.h \ auto/osdef.h ascii.h keymap.h term.h macros.h option.h structs.h \ regexp.h gui.h gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h \ - globals.h farsi.h arabic.h + globals.h farsi.h arabic.h if_py_both.h objects/if_python3.o: if_python3.c vim.h auto/config.h feature.h os_unix.h \ auto/osdef.h ascii.h keymap.h term.h macros.h option.h structs.h \ regexp.h gui.h gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h \ - globals.h farsi.h arabic.h + globals.h farsi.h arabic.h if_py_both.h objects/if_tcl.o: if_tcl.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \ ascii.h keymap.h term.h macros.h option.h structs.h regexp.h gui.h \ gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h globals.h farsi.h \ diff --git a/src/version.h b/src/version.h index cba0d90ed..0bdc981a0 100644 --- a/src/version.h +++ b/src/version.h @@ -19,9 +19,9 @@ #define VIM_VERSION_MINOR_STR "3" #define VIM_VERSION_100 (VIM_VERSION_MAJOR * 100 + VIM_VERSION_MINOR) -#define VIM_VERSION_BUILD 271 -#define VIM_VERSION_BUILD_BCD 0x10f -#define VIM_VERSION_BUILD_STR "271" +#define VIM_VERSION_BUILD 272 +#define VIM_VERSION_BUILD_BCD 0x110 +#define VIM_VERSION_BUILD_STR "272" #define VIM_VERSION_PATCHLEVEL 0 #define VIM_VERSION_PATCHLEVEL_STR "0" /* Used by MacOS port should be one of: development, alpha, beta, final */ @@ -36,5 +36,5 @@ #define VIM_VERSION_NODOT "vim73b" #define VIM_VERSION_SHORT "7.3b" #define VIM_VERSION_MEDIUM "7.3b BETA" -#define VIM_VERSION_LONG "VIM - Vi IMproved 7.3b BETA (2010 Jul 18)" -#define VIM_VERSION_LONG_DATE "VIM - Vi IMproved 7.3b BETA (2010 Jul 18, compiled " +#define VIM_VERSION_LONG "VIM - Vi IMproved 7.3b BETA (2010 Jul 25)" +#define VIM_VERSION_LONG_DATE "VIM - Vi IMproved 7.3b BETA (2010 Jul 25, compiled " |