Compare commits

1 Commits
main ... 1.1

8 changed files with 52 additions and 1674 deletions

12
vim-7.3-help_tags.patch Normal file
View File

@@ -0,0 +1,12 @@
Index: vim-8.2.2411/runtime/doc/Makefile
===================================================================
--- vim-8.2.2411.orig/runtime/doc/Makefile
+++ vim-8.2.2411/runtime/doc/Makefile
@@ -331,6 +331,7 @@ CONVERTED = \
all: tags vim.man evim.man vimdiff.man vimtutor.man xxd.man $(CONVERTED)
# Use Vim to generate the tags file. Can only be used when Vim has been
+ export VIMRUNTIME=../; \
# compiled and installed. Supports multiple languages.
vimtags: $(DOCS)
@$(VIMEXE) --clean -esX -V1 -u doctags.vim

View File

@@ -0,0 +1,14 @@
Index: vim-8.2.2411/src/vimtutor
===================================================================
--- vim-8.2.2411.orig/src/vimtutor
+++ vim-8.2.2411/src/vimtutor
@@ -24,8 +24,7 @@ xx=$1
export xx
# We need a temp file for the copy. First try using a standard command.
-tmp="${TMPDIR-/tmp}"
-TUTORCOPY=`mktemp $tmp/tutorXXXXXX || tempfile -p tutor || echo none`
+TUTORCOPY=`mktemp /tmp/tutorXXXXXX || echo /tmp/tutor$$`
# If the standard commands failed then create a directory to put the copy in.
# That is a secure way to make a temp file.

View File

@@ -0,0 +1,13 @@
Index: vim-9.0.1188/runtime/syntax/fstab.vim
===================================================================
--- vim-9.0.1188.orig/runtime/syntax/fstab.vim
+++ vim-9.0.1188/runtime/syntax/fstab.vim
@@ -35,7 +35,7 @@ syn match fsOperator /[,=:#]/
" Device
syn cluster fsDeviceCluster contains=fsOperator,fsDeviceKeyword,fsDeviceError
syn match fsDeviceError /\%([^a-zA-Z0-9_\/#@:\.-]\|^\w\{-}\ze\W\)/ contained
-syn keyword fsDeviceKeyword contained none proc linproc tmpfs devpts devtmpfs sysfs usbfs
+syn keyword fsDeviceKeyword contained none proc linproc tmpfs debugfs devpts devtmpfs sysfs usbfs
syn keyword fsDeviceKeyword contained LABEL nextgroup=fsDeviceLabel
syn keyword fsDeviceKeyword contained UUID nextgroup=fsDeviceUUID
syn keyword fsDeviceKeyword contained PARTLABEL nextgroup=fsDevicePARTLABEL

BIN
vim-9.1.0330.tar.gz (Stored with Git LFS) Normal file

Binary file not shown.

View File

@@ -1,71 +0,0 @@
From b16c218964d2024a5c52f251a49c9d71da63f9a0 Mon Sep 17 00:00:00 2001
From: Martin Jungblut Schreiner <martinjungblut@gmail.com>
Date: Wed, 5 Mar 2025 17:07:19 -0300
Subject: [PATCH] Revert "runtime(defaults): Detect putty terminal and switch
to dark background"
This reverts commit 2abec431e1ab5f4f6e21c2bb490241732622a8c5.
---
runtime/defaults.vim | 5 -----
runtime/doc/autocmd.txt | 17 ++++-------------
runtime/doc/version9.txt | 3 +++
src/testdir/test_cmdline.vim | 2 --
4 files changed, 7 insertions(+), 20 deletions(-)
Index: vim-9.1.1176/runtime/defaults.vim
===================================================================
--- vim-9.1.1176.orig/runtime/defaults.vim
+++ vim-9.1.1176/runtime/defaults.vim
@@ -112,11 +112,6 @@ if 1
\ | execute "normal! g`\""
\ | endif
- " Set the default background for putty to dark. Putty usually sets the
- " $TERM to xterm and by default it starts with a dark background which
- " makes syntax highlighting often hard to read with bg=light
- " undo this using: ":au! vimStartup TermResponse"
- autocmd TermResponse * if v:termresponse == "\e[>0;136;0c" | set bg=dark | endif
augroup END
" Quite a few people accidentally type "q:" instead of ":q" and get confused
Index: vim-9.1.1176/runtime/doc/autocmd.txt
===================================================================
--- vim-9.1.1176.orig/runtime/doc/autocmd.txt
+++ vim-9.1.1176/runtime/doc/autocmd.txt
@@ -1260,19 +1260,10 @@ TerminalWinOpen Just after a terminal
TermResponse After the response to |t_RV| is received from
the terminal. The value of |v:termresponse|
can be used to do things depending on the
- terminal version.
- This is used in |defaults.vim| to detect
- putty terminal and set a dark background: >
-
- au TermResponse *
- \ if v:termresponse == "\e[>0;136;0c"
- \ set bg=dark
- \ endif
-<
- Note: that this event may be triggered halfway
- executing another event, especially if file
- I/O, a shell command or anything else that
- takes time is involved.
+ terminal version. Note that this event may be
+ triggered halfway executing another event,
+ especially if file I/O, a shell command or
+ anything else that takes time is involved.
*TermResponseAll*
TermResponseAll After the response to |t_RV|, |t_RC|, |t_RS|,
|t_RB|, |t_RF|, or |t_u7| are received from
Index: vim-9.1.1176/src/testdir/test_cmdline.vim
===================================================================
--- vim-9.1.1176.orig/src/testdir/test_cmdline.vim
+++ vim-9.1.1176/src/testdir/test_cmdline.vim
@@ -1843,8 +1843,6 @@ func Test_verbose_option()
CheckScreendump
let lines =<< trim [SCRIPT]
- " clear the TermResponse autocommand from defaults.vim
- au! vimStartup TermResponse
command DoSomething echo 'hello' |set ts=4 |let v = '123' |echo v
call feedkeys("\r", 't') " for the hit-enter prompt
set verbose=20

BIN
vim-9.1.1176.tar.gz (Stored with Git LFS)

Binary file not shown.

File diff suppressed because it is too large Load Diff

View File

@@ -17,7 +17,7 @@
%define pkg_version 9.1
%define patchlevel 1176
%define patchlevel 0330
%define patchlevel_compact %{patchlevel}
%define VIM_SUBDIR vim91
%define site_runtimepath %{_datadir}/vim/site
@@ -63,18 +63,20 @@ Source98: vim-changelog.sh
Source99: %{name}-7.4-rpmlintrc
Patch3: %{name}-7.4-disable_lang_no.patch
Patch4: %{name}-7.3-gvimrc_fontset.patch
Patch5: %{name}-7.4-highlight_fstab.patch
Patch6: %{name}-7.3-sh_is_bash.patch
Patch7: %{name}-7.3-filetype_ftl.patch
Patch8: %{name}-7.3-help_tags.patch
Patch9: %{name}-7.3-use_awk.patch
Patch10: %{name}-7.3-name_vimrc.patch
Patch11: %{name}-7.3-mktemp_tutor.patch
Patch15: %{name}-7.4-filetype_apparmor.patch
Patch18: %{name}-7.3-filetype_spec.patch
Patch21: %{name}-7.3-filetype_changes.patch
Patch22: %{name}-7.4-filetype_mine.patch
Patch100: %{name}73-no-static-libpython.patch
Patch101: %{name}-8.0.1568-defaults.patch
Patch104: %{name}-8.2.2411-globalvimrc.patch
Patch105: %{name}-9.1.1134-revert-putty-terminal-colors.patch
Patch100: vim73-no-static-libpython.patch
Patch101: vim-8.0.1568-defaults.patch
Patch104: vim-8.2.2411-globalvimrc.patch
BuildRequires: autoconf
BuildRequires: db-devel
BuildRequires: fdupes
@@ -211,10 +213,13 @@ a hex dump back to its original binary form.
%patch -P 3 -p1
%patch -P 4 -p1
%patch -P 5 -p1
%patch -P 6 -p1
%patch -P 7 -p1
%patch -P 8 -p1
%patch -P 9 -p1
%patch -P 10 -p1
%patch -P 11 -p1
cp %{SOURCE23} runtime/syntax/apparmor.vim
%patch -P 15 -p1
%patch -P 18 -p1
@@ -223,7 +228,6 @@ cp %{SOURCE23} runtime/syntax/apparmor.vim
%patch -P 100 -p1
%patch -P 101 -p1
%patch -P 104 -p1
%patch -P 105 -p1
cp %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE8} %{SOURCE10} .
%build
@@ -415,10 +419,6 @@ install -D -m 0644 \
vimrc_example1 vimrc_example2 suse.vimrc \
README.txt READMEdir/README_src.txt READMEdir/README_unix.txt \
%{buildroot}%{_docdir}/vim/
rm -f %{buildroot}%{_datadir}/vim/%{VIM_SUBDIR}/LICENSE
rm -f %{buildroot}%{_datadir}/vim/%{VIM_SUBDIR}/README.txt
# gvim
install -D -m 0644 \
README.Japanese-XIM runtime/gvimrc_example.vim suse.gvimrc \