diff options
author | Bram Moolenaar <Bram@vim.org> | 2006-03-15 23:06:44 +0000 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2006-03-15 23:06:44 +0000 |
commit | 27dc19509b0521a800d7af45970016458209f060 (patch) | |
tree | ffd8a9f7c7962759cac12bd81b06e57fb3be55a4 | |
parent | 95e9b49537e5e6c2d8aa38595afbf404f7f483e6 (diff) |
updated for version 7.0225
-rw-r--r-- | runtime/doc/todo.txt | 24 | ||||
-rw-r--r-- | runtime/doc/version7.txt | 12 | ||||
-rw-r--r-- | src/main.c | 22 | ||||
-rw-r--r-- | src/testdir/Make_vms.mms | 5 |
4 files changed, 34 insertions, 29 deletions
diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt index fdd782ff58..6d2aed030e 100644 --- a/runtime/doc/todo.txt +++ b/runtime/doc/todo.txt @@ -1,4 +1,4 @@ -*todo.txt* For Vim version 7.0aa. Last change: 2006 Mar 14 +*todo.txt* For Vim version 7.0aa. Last change: 2006 Mar 15 VIM REFERENCE MANUAL by Bram Moolenaar @@ -30,10 +30,6 @@ be worked on, but only if you sponsor Vim development. See |sponsor|. *known-bugs* -------------------- Known bugs and current work ----------------------- -- UNDO TREE: - Make proper test for "g+" and "g-", :earlier, :later - Verify there are no memory leaks. - Win32: Describe how to do debugging. (George Reilly) Mac unicode patch (Da Woon Jung, Eckehard Berns): @@ -49,20 +45,10 @@ Mac unicode patch (Da Woon Jung, Eckehard Berns): CONSIDERED FOR VERSION 7.0: - EMBEDDING: Make it possible to run Vim inside a window of another program. - For Xwindows this can be done with XReparentWindow(). For GTK Neil Bird has a patch to use Vim like a widget. -- Add a few more things to 'diffopt': "horizontal", "vertical", - "foldcolumn". (Benji Fisher, 2004 Jun 21) -- FileChangedShellPost autocommand event: after (not) reloading a changed - file. Can be used to update statusline oslt. -- VimResized autocmd event: When the Vim window has been resized (SIGWINCH) - patch from Yakov Lerner, 2003 July 24. - It's not clear that this doesn't cause problems when the executed - commands do something like changing 'lines'. Esp. because the - screen has not yet been allocated with the new size. 7 Make ":startinsert" command work directly for functions and scripts? - Also make it possible to append (it's difficult at end of line). + - When using 'incsearch" CTRL-R CTRL-W gets the word under the cursor, but the part that already matched is doubled then. Remove the part of the word that would be doubled. Make it work line CTRL-N in Insert mode. @@ -106,8 +92,6 @@ Profiling: - :profile pause - :profile resume -Add more tests for all new functionality in Vim 7. Especially new functions. - 'errorformat' docs are a bit unclear. Suggestions by Charles Campbell (2006 Jan 6) Add a flag to check for a match with the next item first? Helps for @@ -119,6 +103,8 @@ mappings for normal keys can be removed from Select mode. Check if file explorer can handle directory names and links with a single quote. (Nieko Maatjes, 2005 Jan 4) +Add more tests for all new functionality in Vim 7. Especially new functions. + Awaiting updated patches: 8 Add ":n" to fnamemodify(): normalize path, remove "../" when possible. @@ -1065,6 +1051,8 @@ Didn't make it into Vim 7.0: values for the optional fields. E.g., ":tag size type=m". Also allow specifying the file and command, so that the result of taglist() can be used. +- X11: Make it possible to run Vim inside a window of another program. + This can be done with XReparentWindow(). But how exactly? Documentation: diff --git a/runtime/doc/version7.txt b/runtime/doc/version7.txt index f63518d78b..a22e8215c3 100644 --- a/runtime/doc/version7.txt +++ b/runtime/doc/version7.txt @@ -1,4 +1,4 @@ -*version7.txt* For Vim version 7.0aa. Last change: 2006 Mar 14 +*version7.txt* For Vim version 7.0aa. Last change: 2006 Mar 15 VIM REFERENCE MANUAL by Bram Moolenaar @@ -722,6 +722,10 @@ New autocommand events: ~ |ShellCmdPost| after executing a shell command |ShellFilterPost| after filtering with a shell command +|VimResized| after the Vim window size changed (Yakov Lerner) + +|FileChangedShellPost| after handling a file changed outside of Vim + |SourcePre| before sourcing a Vim script |CursorHoldI| the user doesn't press a key for a while in Insert mode @@ -1121,6 +1125,9 @@ completion supported for the input. (Yegappan Lakshmanan) "dp" works with more than two buffers in diff mode if there is only one where 'modifiable' is set. +The 'diffopt' option has three new values: "horizontal", "vertical" and +"foldcolumn". + When the 'include' option contains \zs the file name found is what is being matched from \zs to the end or \ze. Useful to pass more to 'includeexpr'. @@ -1218,6 +1225,9 @@ without copying the code. "make" now creates the Vim.app directory and "make install" copies it to its final destination. (Raf) +Put the runtime directory not directly in Vim.app but in +Vim.app/Contents/Resources/vim, so that it's according to Mac specs. + Made it possible to compile with Motif, Athena or GTK without tricks and still being able to use the MacRoman conversion. Added the os_mac_conv.c file. diff --git a/src/main.c b/src/main.c index ca8de176e1..3209183bae 100644 --- a/src/main.c +++ b/src/main.c @@ -416,13 +416,8 @@ main TIME_MSG("expanding arguments"); #ifdef FEAT_DIFF - if (params.diff_mode) - { - if (params.window_count == -1) - params.window_count = 0; /* open up to 3 windows */ - if (params.window_layout == 0) - params.window_layout = WIN_VER; /* use vertical split */ - } + if (params.diff_mode && params.window_count == -1) + params.window_count = 0; /* open up to 3 windows */ #endif /* Don't redraw until much later. */ @@ -556,6 +551,17 @@ main } #endif +#ifdef FEAT_DIFF + /* Decide about window layout for diff mode after reading vimrc. */ + if (params.diff_mode && params.window_layout == 0) + { + if (diffopt_horizontal()) + params.window_layout = WIN_HOR; /* use horizontal split */ + else + params.window_layout = WIN_VER; /* use vertical split */ + } +#endif + /* * Recovery mode without a file name: List swap files. * This uses the 'dir' option, therefore it must be after the @@ -1357,7 +1363,7 @@ parse_command_name(parmp) disallow_gui = TRUE; /* TODO: On MacOS X default to gui if argv[0] ends in: - * /vim.app/Contents/MacOS/Vim */ + * /Vim.app/Contents/MacOS/Vim */ #endif #ifdef FEAT_EVAL diff --git a/src/testdir/Make_vms.mms b/src/testdir/Make_vms.mms index 767ab78405..57101fc131 100644 --- a/src/testdir/Make_vms.mms +++ b/src/testdir/Make_vms.mms @@ -4,7 +4,7 @@ # Authors: Zoltan Arpadffy, <arpadffy@polarhome.com> # Sandor Kopanyi, <sandor.kopanyi@mailbox.hu> # -# Last change: 2005 Jul 05 +# Last change: 2006 Mar 15 # # This has been tested on VMS 6.2 to 7.2 on DEC Alpha and VAX. # Edit the lines in the Configuration section below to select. @@ -58,7 +58,8 @@ SCRIPT = test1.out test2.out test3.out test4.out test5.out \ test38.out test39.out test40.out test41.out test42.out \ test43.out test44.out test45.out test46.out \ test48.out test51.out test53.out test54.out test55.out \ - test56.out test57.out test58.out test59.out test60.out + test56.out test57.out test58.out test59.out test60.out \ + test61.out .IFDEF WANT_GUI SCRIPT_GUI = test16.out |