diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-09-19 04:05:20 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-09-19 04:05:20 +0000 |
| commit | a98d3d3746fcdb75af06635accad53296e633f01 (patch) | |
| tree | 17e937ded5543ef39e5170137d7a5810dbd09914 /debian/patches | |
| parent | Merging upstream version 2:9.1.0698. (diff) | |
| download | vim-a98d3d3746fcdb75af06635accad53296e633f01.tar.xz vim-a98d3d3746fcdb75af06635accad53296e633f01.zip | |
Merging debian version 2:9.1.0698-1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'debian/patches')
3 files changed, 6 insertions, 6 deletions
diff --git a/debian/patches/debian/Add-recognition-of-more-LaTeX-commands-for-tex-filetype-d.patch b/debian/patches/debian/Add-recognition-of-more-LaTeX-commands-for-tex-filetype-d.patch index a13aeac..7903dde 100644 --- a/debian/patches/debian/Add-recognition-of-more-LaTeX-commands-for-tex-filetype-d.patch +++ b/debian/patches/debian/Add-recognition-of-more-LaTeX-commands-for-tex-filetype-d.patch @@ -13,10 +13,10 @@ Signed-off-by: James McCoy <jamessan@debian.org> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runtime/autoload/dist/ft.vim b/runtime/autoload/dist/ft.vim -index bf9e32e..2f11f7a 100644 +index c8942eb..2faabe2 100644 --- a/runtime/autoload/dist/ft.vim +++ b/runtime/autoload/dist/ft.vim -@@ -1071,7 +1071,7 @@ export def FTtex() +@@ -1112,7 +1112,7 @@ export def FTtex() var firstNC = search('^\s*[^[:space:]%]', 'c', 1000) if firstNC > 0 # Check the next thousand lines for a LaTeX or ConTeXt keyword. diff --git a/debian/patches/debian/Document-Debian-s-decision-to-disable-modelines-by-defaul.patch b/debian/patches/debian/Document-Debian-s-decision-to-disable-modelines-by-defaul.patch index 926b47e..a11b9ee 100644 --- a/debian/patches/debian/Document-Debian-s-decision-to-disable-modelines-by-defaul.patch +++ b/debian/patches/debian/Document-Debian-s-decision-to-disable-modelines-by-defaul.patch @@ -15,10 +15,10 @@ Signed-off-by: James McCoy <jamessan@debian.org> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt -index 6ec4031..1687b8e 100644 +index 3ec8a3a..145f2f6 100644 --- a/runtime/doc/options.txt +++ b/runtime/doc/options.txt -@@ -5611,7 +5611,7 @@ A jump table for the options with a short description can be found at |Q_op|. +@@ -5616,7 +5616,7 @@ A jump table for the options with a short description can be found at |Q_op|. *'modeline'* *'ml'* *'nomodeline'* *'noml'* 'modeline' 'ml' boolean (Vim default: on (off for root), diff --git a/debian/patches/debian/Support-sourcing-a-vimrc.tiny-when-Vim-is-invoked-as-vi.patch b/debian/patches/debian/Support-sourcing-a-vimrc.tiny-when-Vim-is-invoked-as-vi.patch index 25d23e4..e437e8f 100644 --- a/debian/patches/debian/Support-sourcing-a-vimrc.tiny-when-Vim-is-invoked-as-vi.patch +++ b/debian/patches/debian/Support-sourcing-a-vimrc.tiny-when-Vim-is-invoked-as-vi.patch @@ -86,10 +86,10 @@ index 99184ab..6db866e 100644 # define SYS_VIMRC_FILE "$VIM/vimrc" #endif diff --git a/src/structs.h b/src/structs.h -index 7e21f0f..8ed1481 100644 +index 79f415d..d749091 100644 --- a/src/structs.h +++ b/src/structs.h -@@ -4603,6 +4603,9 @@ typedef struct +@@ -4607,6 +4607,9 @@ typedef struct #ifdef FEAT_DIFF int diff_mode; // start with 'diff' set #endif |