Mercurial > vim
annotate runtime/doc/vimdiff-pl.1 @ 33521:1f9b1def80c8 v9.0.2009
patch 9.0.2009: cmdline-completion for comma-separated options wrong
Commit: https://github.com/vim/vim/commit/54844857fd6933fa4f6678e47610c4b9c9f7a091
Author: Yee Cheng Chin <ychin.git@gmail.com>
Date: Mon Oct 9 18:12:31 2023 +0200
patch 9.0.2009: cmdline-completion for comma-separated options wrong
Problem: cmdline-completion for comma-separated options wrong
Solution: Fix command-line expansions for options with filenames with
commas
Fix command-line expansions for options with filenames with commas
Cmdline expansion for option values that take a comma-separated list
of file names is currently not handling file names with commas as the
commas are not escaped. For such options, the commas in file names need
to be escaped (to differentiate from a comma that delimit the list
items). The escaped comma is unescaped in `copy_option_part()` during
option parsing.
Fix as follows:
- Cmdline completion for option values with comma-separated file/folder
names will not start a new match when seeing `\\,` and will instead
consider it as one value.
- File/folder regex matching will strip the `\\` when seeing `\\,` to
make sure it can match the correct files/folders.
- The expanded value will escape `,` with `\\,`, similar to how spaces
are escaped to make sure the option value is correct on the cmdline.
This fix also takes into account the fact that Win32 Vim handles file
name escaping differently. Typing '\,' for a file name results in it
being handled literally but in other platforms '\,' is interpreted as a
simple ',' and commas need to be escaped using '\\,' instead.
Also, make sure this new logic only applies to comma-separated options
like 'path'. Non-list options like 'set makeprg=<Tab>' and regular ex
commands like `:edit <Tab>` do not require escaping and will continue to
work.
Also fix up documentation to be clearer. The original docs are slightly
misleading in how it discusses triple slashes for 'tags'.
closes: #13303
related: #13301
Signed-off-by: Christian Brabandt <cb@256bit.org>
Co-authored-by: Yee Cheng Chin <ychin.git@gmail.com>
author | Christian Brabandt <cb@256bit.org> |
---|---|
date | Mon, 09 Oct 2023 18:30:04 +0200 |
parents | de5a43c5eedc |
children |
rev | line source |
---|---|
809 | 1 .TH VIMDIFF 1 "2001 Mar 30" |
2 .SH NAZWA | |
2033
de5a43c5eedc
Update documentation files.
Bram Moolenaar <bram@zimbu.org>
parents:
809
diff
changeset
|
3 vimdiff \- edytuj dwie, trzy lub cztery wersje pliku w Vimie i zobacz różnice |
809 | 4 .SH SYNOPSIS |
5 .br | |
6 .B vimdiff | |
2033
de5a43c5eedc
Update documentation files.
Bram Moolenaar <bram@zimbu.org>
parents:
809
diff
changeset
|
7 [opcje] plik1 plik2 [plik3 [plik4]] |
809 | 8 .PP |
9 .B gvimdiff | |
10 .SH OPIS | |
11 .B Vimdiff | |
12 uruchomi | |
13 .B Vima | |
2033
de5a43c5eedc
Update documentation files.
Bram Moolenaar <bram@zimbu.org>
parents:
809
diff
changeset
|
14 z dwoma (trzema lub czterema plikami), każdy z nich we własnym oknie. |
809 | 15 Różnice między plikami zostaną podświetlone. |
16 Jest to dobry sposób by przeanalizować różnice i przenieść zmiany z jednej | |
17 wersji pliku do innej. | |
18 .PP | |
19 Zobacz vim(1) by poznać więcej szczegółów o samym Vimie. | |
20 .PP | |
21 Kiedy uruchomiony jako | |
22 .B gvimdiff | |
23 zostanie uruchomione GUI (jeśli dostępne). | |
24 .PP | |
25 W każdym oknie zostanie ustawiona opcja 'diff', która spowoduje | |
26 podświetlenie różnic. | |
27 .br | |
2033
de5a43c5eedc
Update documentation files.
Bram Moolenaar <bram@zimbu.org>
parents:
809
diff
changeset
|
28 Opcje 'wrap' i 'scrollbind' zostaną ustawione by tekst się |
de5a43c5eedc
Update documentation files.
Bram Moolenaar <bram@zimbu.org>
parents:
809
diff
changeset
|
29 wygodnie przeglądało. |
809 | 30 .br |
2033
de5a43c5eedc
Update documentation files.
Bram Moolenaar <bram@zimbu.org>
parents:
809
diff
changeset
|
31 Opcja 'foldmethod' zostanie ustawiona na "diff", dzięki czemu |
809 | 32 niezmienione linie zostaną zwinięte. 'foldcolumn' będzie równe 2 aby |
33 łatwo wyszukiwać, otwierać i zamykać zwinięcia. | |
34 .SH OPCJE | |
2033
de5a43c5eedc
Update documentation files.
Bram Moolenaar <bram@zimbu.org>
parents:
809
diff
changeset
|
35 Pionowy podział zostanie użyty do wyrównania linii, tak jakby użyto |
809 | 36 opcji "\-O". Aby uzyskać poziomy podział użyj opcji "\-o". |
37 .PP | |
38 Aby poznać inne opcje zobacz vim(1). | |
39 .SH ZOBACZ TAKŻE | |
40 vim(1) | |
41 .SH AUTOR | |
42 Większość | |
43 .B Vima | |
44 została napisana przez Brama Moolenaara przy pomocy wielu innych osób. | |
45 Zobacz ":help credits w | |
46 .B Vimie. |