0
0
mirror of https://github.com/vim/vim.git synced 2025-09-01 21:03:39 -04:00

Fix hang when resizing in diff mode and there are concealed items.

This commit is contained in:
Bram Moolenaar 2010-07-20 22:33:34 +02:00
parent 5bedfc6091
commit c095b280df
4 changed files with 16 additions and 24 deletions

View File

@ -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'.

View File

@ -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|

View File

@ -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)

View File

@ -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