diff options
| -rw-r--r-- | runtime/doc/editing.txt | 3 | ||||
| -rw-r--r-- | runtime/doc/os_win32.txt | 11 | ||||
| -rw-r--r-- | runtime/doc/todo.txt | 20 | ||||
| -rw-r--r-- | src/screen.c | 6 |
4 files changed, 16 insertions, 24 deletions
diff --git a/runtime/doc/editing.txt b/runtime/doc/editing.txt index 4d5b00fb9..9cbb14f34 100644 --- a/runtime/doc/editing.txt +++ b/runtime/doc/editing.txt @@ -1414,6 +1414,9 @@ An encrypted file can be recognized by the "file" command, if you add this line to "/etc/magic", "/usr/share/misc/magic" or wherever your system has the "magic" file: > 0 string VimCrypt~ Vim encrypted file + >9 string 01 - "zip" cryptmethod + >9 string 02 - "blowfish" cryptmethod + Notes: - Encryption is not possible when doing conversion with 'charconvert'. diff --git a/runtime/doc/os_win32.txt b/runtime/doc/os_win32.txt index 02641d9b9..caa259709 100644 --- a/runtime/doc/os_win32.txt +++ b/runtime/doc/os_win32.txt @@ -7,10 +7,13 @@ *win32* *Win32* *MS-Windows* This file documents the idiosyncrasies of the Win32 version of Vim. -The Win32 version of Vim works on both Windows NT and Windows 95. There are -both console and GUI versions. There is GUI version for use in the Win32s -subsystem in Windows 3.1[1]. You can also use the 32-bit DOS version of Vim -instead. See |os_msdos.txt|. +The Win32 version of Vim works on Windows NT, 95, 98, ME, XP, Vista and +Windows 7. There are both console and GUI versions. + +The 32 bit version also runs on 64 bit MS-Windows systems. + +There is GUI version for use in the Win32s subsystem in Windows 3.1[1]. You +can also use the 32-bit DOS version of Vim instead. See |os_msdos.txt|. 1. Known problems |win32-problems| 2. Startup |win32-startup| diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt index a77f68490..fdc6e4823 100644 --- a/runtime/doc/todo.txt +++ b/runtime/doc/todo.txt @@ -30,8 +30,6 @@ be worked on, but only if you sponsor Vim development. See |sponsor|. *known-bugs* -------------------- Known bugs and current work ----------------------- -GTK: torn-off menu doesn't work. - 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 @@ -4661,7 +4659,6 @@ Various improvements: From Elvis: - Use "instman.sh" to install manpages? - Add ":alias" command. -- fontchanges recognized "\\fB" etc. - Search patterns: \@ match word under cursor. but do: @@ -4678,23 +4675,6 @@ From Elvis: program to use with ":cc". Use ":compile" instead of ":cc"? -From Nvi: -- 'searchincr' option, alias for 'incsearch'? -- 'leftright' option, alias for 'nowrap'? -- Have a look at "vi/doc/vi.chart", for Nvi specialties. -8 Add 'keytime', time in 1/10 sec for mapping timeout? -- Add 'filec' option as an alternative for 'wildchar'. -6 Support Nvi command names as an alias: - :bg :hide - :fg fname :buf fname (with 'hidden' set?) - :dis b :ls - :Edit fname :split fname - :Fg fname :sbuf fname (with 'hidden' set?) - :Next :snext (can't do this, already use :Next) - :Previous :sprevious - :Tag :stag - - From xvi: - CTRL-_ : swap 8th bit of character. - Add egrep-like regex type, like xvi (Ned Konz) or Perl (Emmanuel Mogenet) diff --git a/src/screen.c b/src/screen.c index db26046ae..69df0b2cd 100644 --- a/src/screen.c +++ b/src/screen.c @@ -4055,6 +4055,12 @@ win_line(wp, lnum, startrow, endrow, nochange) char_attr = syntax_attr; else char_attr = hl_combine_attr(syntax_attr, char_attr); +# ifdef FEAT_CONCEAL + /* no concealing past the end of the line, it interferes + * with line highlighting */ + if (c == NUL) + syntax_flags = 0; +# endif } #endif |