Mercurial > vim
view runtime/doc/vimdiff-pl.1 @ 32721:94f4a488412e v9.0.1683
Updated runtime files
Commit: https://github.com/vim/vim/commit/6efb1980336ff324e9c57a4e282530b952fca816
Author: Christian Brabandt <cb@256bit.org>
Date: Thu Aug 10 05:44:25 2023 +0200
Updated runtime files
This is a collection of various PRs from github that all require a minor
patch number:
1) https://github.com/vim/vim/pull/12612
Do not conflate dictionary key with end of block
2) https://github.com/vim/vim/pull/12729:
When saving and restoring 'undolevels', the constructs `&undolevels` and
`:set undolevels` are problematic.
The construct `&undolevels` reads an unpredictable value; it will be the
local option value (if one has been set), or the global option value
(otherwise), making it unsuitable for saving a value for later
restoration.
Similarly, if a local option value has been set for 'undolevels',
temporarily modifying the option via `:set undolevels` changes the local
value as well as the global value, requiring extra work to restore both
values.
Saving and restoring the option value in one step via the construct
`:let &undolevels = &undolevels` appears to make no changes to the
'undolevels' option, but if a local option has been set to a different
value than the global option, it has the unintended effect of changing
the global 'undolevels' value to the local value.
Update the documentation to explain these issues and recommend explicit
use of global and local option values when saving and restoring. Update
some unit tests to use `g:undolevels`.
3) https://github.com/vim/vim/pull/12702:
Problem: Pip requirements files are not recognized.
Solution: Add a pattern to match pip requirements files.
4) https://github.com/vim/vim/pull/12688:
Add indent file and tests for ABB Rapid
5) https://github.com/vim/vim/pull/12668:
Use Lua 5.1 numeric escapes in tests and add to CI
Only Lua 5.2+ and LuaJIT understand hexadecimal escapes in strings. Lua
5.1 only supports decimal escapes:
> A character in a string can also be specified by its numerical value
> using the escape sequence \ddd, where ddd is a sequence of up to three
> decimal digits. (Note that if a numerical escape is to be followed by a
> digit, it must be expressed using exactly three digits.) Strings in Lua
> can contain any 8-bit value, including embedded zeros, which can be
> specified as '\0'.
To make sure this works with Lua 5.4 and Lua 5.1 change the Vim CI to
run with Lua 5.1 as well as Lua 5.4
6) https://github.com/vim/vim/pull/12631:
Add hurl filetype detection
7) https://github.com/vim/vim/pull/12573:
Problem: Files for haskell persistent library are not recognized
Solution: Add pattern persistentmodels for haskell persistent library
closes: #12612
closes: #12729
closes: #12702
closes: #12688
closes: #12668
closes: #12631
closes: #12573
Co-authored-by: lacygoill <lacygoill@lacygoill.me>
Co-authored-by: Michael Henry <drmikehenry@drmikehenry.com>
Co-authored-by: ObserverOfTime <chronobserver@disroot.org>
Co-authored-by: KnoP-01 <knosowski@graeffrobotics.de>
Co-authored-by: James McCoy <jamessan@jamessan.com>
Co-authored-by: Jacob Pfeifer <jacob@pfeifer.dev>
Co-authored-by: Borys Lykah <lykahb@fastmail.com>
author | Christian Brabandt <cb@256bit.org> |
---|---|
date | Thu, 10 Aug 2023 06:30:06 +0200 |
parents | de5a43c5eedc |
children |
line wrap: on
line source
.TH VIMDIFF 1 "2001 Mar 30" .SH NAZWA vimdiff \- edytuj dwie, trzy lub cztery wersje pliku w Vimie i zobacz różnice .SH SYNOPSIS .br .B vimdiff [opcje] plik1 plik2 [plik3 [plik4]] .PP .B gvimdiff .SH OPIS .B Vimdiff uruchomi .B Vima z dwoma (trzema lub czterema plikami), każdy z nich we własnym oknie. Różnice między plikami zostaną podświetlone. Jest to dobry sposób by przeanalizować różnice i przenieść zmiany z jednej wersji pliku do innej. .PP Zobacz vim(1) by poznać więcej szczegółów o samym Vimie. .PP Kiedy uruchomiony jako .B gvimdiff zostanie uruchomione GUI (jeśli dostępne). .PP W każdym oknie zostanie ustawiona opcja 'diff', która spowoduje podświetlenie różnic. .br Opcje 'wrap' i 'scrollbind' zostaną ustawione by tekst się wygodnie przeglądało. .br Opcja 'foldmethod' zostanie ustawiona na "diff", dzięki czemu niezmienione linie zostaną zwinięte. 'foldcolumn' będzie równe 2 aby łatwo wyszukiwać, otwierać i zamykać zwinięcia. .SH OPCJE Pionowy podział zostanie użyty do wyrównania linii, tak jakby użyto opcji "\-O". Aby uzyskać poziomy podział użyj opcji "\-o". .PP Aby poznać inne opcje zobacz vim(1). .SH ZOBACZ TAKŻE vim(1) .SH AUTOR Większość .B Vima została napisana przez Brama Moolenaara przy pomocy wielu innych osób. Zobacz ":help credits w .B Vimie.