annotate runtime/doc/vimdiff-ru.UTF-8.1 @ 33947:f4d88db48a63 v9.0.2168

patch 9.0.2168: Moving tabpages on :drop may cause an endless loop Commit: https://github.com/vim/vim/commit/df12e39b8b9dd39056e22b452276622cb7b617fd Author: Christian Brabandt <cb@256bit.org> Date: Sat Dec 16 13:55:32 2023 +0100 patch 9.0.2168: Moving tabpages on :drop may cause an endless loop Problem: Moving tabpages on :drop may cause an endless loop Solution: Disallow moving tabpages on :drop when cleaning up the arglist first Moving tabpages during drop command may cause an endless loop When executing a :tab drop command, Vim will close all windows not in the argument list. This triggers various autocommands. If a user has created an 'au Tabenter * :tabmove -' autocommand, this can cause Vim to end up in an endless loop, when trying to iterate over all tabs (which would trigger the tabmove autocommand, which will change the tpnext pointer, etc). So instead of blocking all autocommands before we actually try to edit the given file, lets simply disallow to move tabpages around. Otherwise, we may change the expected number of events triggered during a :drop command, which users may rely on (there is actually a test, that expects various TabLeave/TabEnter autocommands) and would therefore be a backwards incompatible change. Don't make this an error, as this could trigger several times during the drop command, but silently ignore the :tabmove command in this case (and it should in fact finally trigger successfully when loading the given file in a new tab). So let's just be quiet here instead. fixes: #13676 closes: #13686 Signed-off-by: Christian Brabandt <cb@256bit.org>
author Christian Brabandt <cb@256bit.org>
date Sat, 16 Dec 2023 14:00:05 +0100
parents de5a43c5eedc
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
220
01e77186b20a updated for version 7.0062
vimboss
parents:
diff changeset
1 .TH VIMDIFF 1 "2001 March 30"
01e77186b20a updated for version 7.0062
vimboss
parents:
diff changeset
2 .SH ИМЯ
01e77186b20a updated for version 7.0062
vimboss
parents:
diff changeset
3 vimdiff \- позволяет редактировать две или три версии файла с помощью Vim
01e77186b20a updated for version 7.0062
vimboss
parents:
diff changeset
4 с отображением различий.
01e77186b20a updated for version 7.0062
vimboss
parents:
diff changeset
5 .SH КОМАНДНАЯ СТРОКА
01e77186b20a updated for version 7.0062
vimboss
parents:
diff changeset
6 .br
01e77186b20a updated for version 7.0062
vimboss
parents:
diff changeset
7 .B vimdiff
01e77186b20a updated for version 7.0062
vimboss
parents:
diff changeset
8 [ключи] файл1 файл2 [файл3]
01e77186b20a updated for version 7.0062
vimboss
parents:
diff changeset
9 .PP
01e77186b20a updated for version 7.0062
vimboss
parents:
diff changeset
10 .B gvimdiff
01e77186b20a updated for version 7.0062
vimboss
parents:
diff changeset
11 .SH ОПИСАНИЕ
01e77186b20a updated for version 7.0062
vimboss
parents:
diff changeset
12 Команда
01e77186b20a updated for version 7.0062
vimboss
parents:
diff changeset
13 .B vimdiff
01e77186b20a updated for version 7.0062
vimboss
parents:
diff changeset
14 загружает в
01e77186b20a updated for version 7.0062
vimboss
parents:
diff changeset
15 .B Vim
01e77186b20a updated for version 7.0062
vimboss
parents:
diff changeset
16 два (или три) файла. Каждый файл открывается в собственном окне.
01e77186b20a updated for version 7.0062
vimboss
parents:
diff changeset
17 Различия между файлами отображаются с помощью подсветки синтаксиса.
01e77186b20a updated for version 7.0062
vimboss
parents:
diff changeset
18 Эта команда позволяет наглядно отображать внесённые изменения и переносить
01e77186b20a updated for version 7.0062
vimboss
parents:
diff changeset
19 различающиеся фрагменты из одной версии файла в другую.
01e77186b20a updated for version 7.0062
vimboss
parents:
diff changeset
20 .PP
01e77186b20a updated for version 7.0062
vimboss
parents:
diff changeset
21 Подробнее о Vim см. на странице справочника vim(1).
01e77186b20a updated for version 7.0062
vimboss
parents:
diff changeset
22 .PP
01e77186b20a updated for version 7.0062
vimboss
parents:
diff changeset
23 При запуске с помощью команды
01e77186b20a updated for version 7.0062
vimboss
parents:
diff changeset
24 .B gvimdiff
01e77186b20a updated for version 7.0062
vimboss
parents:
diff changeset
25 редактор запускается в режиме графического интерфейса, если это возможно.
01e77186b20a updated for version 7.0062
vimboss
parents:
diff changeset
26 .PP
01e77186b20a updated for version 7.0062
vimboss
parents:
diff changeset
27 В каждом окне включается опция 'diff', что позволяет использовать подсветку
01e77186b20a updated for version 7.0062
vimboss
parents:
diff changeset
28 синтаксиса для отображения различий между файлами.
01e77186b20a updated for version 7.0062
vimboss
parents:
diff changeset
29 .br
01e77186b20a updated for version 7.0062
vimboss
parents:
diff changeset
30 Для улучшения работы с файлами в режиме отображения отличий также включаются
01e77186b20a updated for version 7.0062
vimboss
parents:
diff changeset
31 опции 'wrap' и 'scrollbind'.
01e77186b20a updated for version 7.0062
vimboss
parents:
diff changeset
32 .br
01e77186b20a updated for version 7.0062
vimboss
parents:
diff changeset
33 Значение опции 'foldmethod' устанавливается равным "diff", что позволяет
01e77186b20a updated for version 7.0062
vimboss
parents:
diff changeset
34 прятать в складку области текста, которые не отличаются в различных версиях файла.
01e77186b20a updated for version 7.0062
vimboss
parents:
diff changeset
35 Значение опции 'foldcolumn' устанавливается равным 2, чтобы было проще
01e77186b20a updated for version 7.0062
vimboss
parents:
diff changeset
36 находить, открывать и закрывать такие складки.
01e77186b20a updated for version 7.0062
vimboss
parents:
diff changeset
37 .SH КЛЮЧИ ЗАПУСКА
01e77186b20a updated for version 7.0062
vimboss
parents:
diff changeset
38 Для выравнивания строк между окнами используется вертикальное разделение окон,
2033
de5a43c5eedc Update documentation files.
Bram Moolenaar <bram@zimbu.org>
parents: 220
diff changeset
39 как если бы использовался ключ "\-O". Для того, чтобы использовать разделение
de5a43c5eedc Update documentation files.
Bram Moolenaar <bram@zimbu.org>
parents: 220
diff changeset
40 окон по горизонтали, следует указать в командной строке ключ "\-o".
220
01e77186b20a updated for version 7.0062
vimboss
parents:
diff changeset
41 .PP
01e77186b20a updated for version 7.0062
vimboss
parents:
diff changeset
42 Остальные ключи командной строки рассматриваются на странице справочника vim(1).
01e77186b20a updated for version 7.0062
vimboss
parents:
diff changeset
43 .SH СМОТРИ ТАКЖЕ
01e77186b20a updated for version 7.0062
vimboss
parents:
diff changeset
44 vim(1)
01e77186b20a updated for version 7.0062
vimboss
parents:
diff changeset
45 .SH АВТОРЫ
01e77186b20a updated for version 7.0062
vimboss
parents:
diff changeset
46 Большая часть
01e77186b20a updated for version 7.0062
vimboss
parents:
diff changeset
47 .B Vim
01e77186b20a updated for version 7.0062
vimboss
parents:
diff changeset
48 создана Брамом Мооленааром (Bram Moolenaar), которому помогает огромное
01e77186b20a updated for version 7.0062
vimboss
parents:
diff changeset
49 количество людей. См. ":help credits" в
01e77186b20a updated for version 7.0062
vimboss
parents:
diff changeset
50 .B Vim.