Mercurial > vim
changeset 2254:4620acaf4814 vim73
One more fix for conceal patch.
| author | Bram Moolenaar <bram@vim.org> |
|---|---|
| date | Sun, 06 Jun 2010 17:41:24 +0200 |
| parents | 12ebd6f6dfce |
| children | e5265e4d4725 |
| files | runtime/doc/syntax.txt runtime/doc/todo.txt src/ex_cmds.c src/gui_gtk_x11.c src/window.c |
| diffstat | 5 files changed, 17 insertions(+), 19 deletions(-) [+] |
line wrap: on
line diff
--- a/runtime/doc/syntax.txt +++ b/runtime/doc/syntax.txt @@ -4521,14 +4521,21 @@ italic etc regions) in another. The 'scr To set the current window to have the syntax "foo", separately from all other windows on the buffer: > :ownsyntax foo +< *w:current_syntax* +This will set the "w:current_syntax" variable to "foo". The value of +"b:current_syntax" does not change. This is implemented by saving and +restoring "b:current_syntax", since the syntax files do set +"b:current_syntax". The value set by the syntax file is assigned to +"w:current_syntax". Once a window has its own syntax, syntax commands executed from other windows on the same buffer (including :syntax clear) have no effect. Conversely, syntax commands executed from that window do not effect other windows on the same buffer. -A window with its own syntax reverts to normal behaviour when another buffer -is loaded into that window. +A window with its own syntax reverts to normal behavior when another buffer +is loaded into that window or the file is reloaded. +When splitting the window, the new window will use the original syntax. ============================================================================== 16. Color xterms *xterm-color* *color-xterm*
--- a/runtime/doc/todo.txt +++ b/runtime/doc/todo.txt @@ -1084,18 +1084,12 @@ restored. (Luc St-Louis) Vim 7.3: -- Included conceal patch. - HL disappears in other window: - :sp - :ownsyntax perl - :e - Documentation update: - remove w:ownsyntax, automatically set w:current_syntax to the value of - b:current_syntax after loading a syntax file. :ownsyntax only sets - w:current_syntax. - using NSIS 2.46: install on Windows 7 works, but no "Edit with Vim" menu. Use register_shell_extension()? (George Reilly, 2010 May 26) Ron's version: http://dev.ronware.org/p/vim/finfo?name=gvim.nsi +- Update for crypt code to use salt. (Mohsin May 30) + Make the strengthen_key value 10000, equivalent to crypting 10 Kbyte of + text. - Also crypt the swap file, each block separately. Change mf_write() and mf_read(). - How to get b_p_key to these functions? -> Store buf_T pointer in mfp. @@ -1106,9 +1100,6 @@ Vim 7.3: - Fill the gaps in the block with random bytes, otherwise it's easy to check for correct password by finding NUL bytes. - Verify recovery works. -- Update for crypt code to use salt. (Mohsin May 30) - Make the strengthen_key value configurable and store it in the header? - Or just use 10000, equivalent to crypting 10 Kbyte of text. - undofile: keep markers where the file was written/read, so that it's easy to go back to a saved version of the file: ":earlier 1f" (f for file)? Also add ":earlier 1d" (d for day).
--- a/src/ex_cmds.c +++ b/src/ex_cmds.c @@ -3571,9 +3571,6 @@ do_ecmd(fnum, ffname, sfname, eap, newln new_name = NULL; #endif buf_freeall(curbuf, FALSE, FALSE); /* free all things for buffer */ -#ifdef FEAT_SYN_HL - reset_synblock(curwin); /* remove any ownsyntax */ -#endif #ifdef FEAT_AUTOCMD /* If autocommands deleted the buffer we were going to re-edit, give * up and jump to the end. */ @@ -3618,6 +3615,10 @@ do_ecmd(fnum, ffname, sfname, eap, newln */ check_arg_idx(curwin); +#ifdef FEAT_SYN_HL + reset_synblock(curwin); /* remove any ownsyntax */ +#endif + #ifdef FEAT_AUTOCMD if (!auto_buf) #endif
--- a/src/gui_gtk_x11.c +++ b/src/gui_gtk_x11.c @@ -4231,7 +4231,7 @@ gui_mch_open(void) #ifdef HAVE_GTK2 /* For GTK2 changing the size of the form widget doesn't cause window * resizing. */ - if (gtk_socket_id == 0) + if (gtk_socket_id == 0) gtk_window_resize(GTK_WINDOW(gui.mainwin), pixel_width, pixel_height); #else gtk_form_set_size(GTK_FORM(gui.formwin), pixel_width, pixel_height);