Accepting request 876221 from home:lnussel:branches:editors
- install suse vimrc in /usr (boo#1182324, vim-8.0.1568-globalvimrc.patch). Add back some settings from defaults.vim that were in suse.vimrc before - prevent double loading of spec.vim OBS-URL: https://build.opensuse.org/request/show/876221 OBS-URL: https://build.opensuse.org/package/show/editors/vim?expand=0&rev=652
This commit is contained in:
parent
d614f5a310
commit
e6ef350dfb
5
spec.vim
5
spec.vim
@ -1,3 +1,8 @@
|
|||||||
|
if exists("loaded_spec") || &cp
|
||||||
|
finish
|
||||||
|
endif
|
||||||
|
let loaded_spec = 1
|
||||||
|
|
||||||
function! SKEL_spec()
|
function! SKEL_spec()
|
||||||
0r /usr/share/vim/current/skeletons/skeleton.spec
|
0r /usr/share/vim/current/skeletons/skeleton.spec
|
||||||
language time en_US
|
language time en_US
|
||||||
|
33
suse.vimrc
33
suse.vimrc
@ -1,19 +1,48 @@
|
|||||||
" /etc/vimrc (configuration file for vim only)
|
" /usr/etc/vimrc (configuration file for vim only)
|
||||||
" author: Klaus Franken <kfr@suse.de>
|
" author: Klaus Franken <kfr@suse.de>
|
||||||
" author: Werner Fink <werner@suse.de>
|
" author: Werner Fink <werner@suse.de>
|
||||||
" author: Florian La Roche <florian@suse.de>
|
" author: Florian La Roche <florian@suse.de>
|
||||||
" version: 2017/04/28
|
" version: 2021/02/22
|
||||||
" commented lines start with `"'
|
" commented lines start with `"'
|
||||||
|
|
||||||
|
" enable syntax highlighting
|
||||||
|
if &t_Co > 2 || has("gui_running")
|
||||||
|
syntax on
|
||||||
|
endif
|
||||||
|
|
||||||
|
" automatically indent lines (default)
|
||||||
|
" set noautoindent
|
||||||
|
|
||||||
|
" select case-insenitiv search (not default)
|
||||||
|
" set ignorecase
|
||||||
|
|
||||||
|
" show cursor line and column in the status line
|
||||||
|
set ruler
|
||||||
|
|
||||||
" show matching brackets
|
" show matching brackets
|
||||||
set showmatch
|
set showmatch
|
||||||
|
|
||||||
" display mode INSERT/REPLACE/...
|
" display mode INSERT/REPLACE/...
|
||||||
set showmode
|
set showmode
|
||||||
|
|
||||||
|
" changes special characters in search patterns (default)
|
||||||
|
" set magic
|
||||||
|
|
||||||
" Required to be able to use keypad keys and map missed escape sequences
|
" Required to be able to use keypad keys and map missed escape sequences
|
||||||
set esckeys
|
set esckeys
|
||||||
|
|
||||||
|
" get easier to use and more user friendly vim defaults
|
||||||
|
" CAUTION: This option breaks some vi compatibility.
|
||||||
|
" Switch it off if you prefer real vi compatibility
|
||||||
|
set nocompatible
|
||||||
|
|
||||||
|
" allow backspacing over everything in insert mode
|
||||||
|
set backspace=indent,eol,start
|
||||||
|
|
||||||
|
" Complete longest common string, then each full match
|
||||||
|
" enable this for bash compatible behaviour
|
||||||
|
" set wildmode=longest,full
|
||||||
|
|
||||||
" Try to get the correct main terminal type
|
" Try to get the correct main terminal type
|
||||||
if &term =~ "xterm"
|
if &term =~ "xterm"
|
||||||
let myterm = "xterm"
|
let myterm = "xterm"
|
||||||
|
@ -25,10 +25,3 @@ Index: vim-8.2.2411/runtime/defaults.vim
|
|||||||
|
|
||||||
" Only do this part when Vim was compiled with the +eval feature.
|
" Only do this part when Vim was compiled with the +eval feature.
|
||||||
if 1
|
if 1
|
||||||
@@ -139,3 +141,6 @@ if has('langmap') && exists('+langremap'
|
|
||||||
" compatible).
|
|
||||||
set nolangremap
|
|
||||||
endif
|
|
||||||
+
|
|
||||||
+" include SUSE tweaks
|
|
||||||
+ru suse.vimrc
|
|
||||||
|
16
vim-8.2.2411-globalvimrc.patch
Normal file
16
vim-8.2.2411-globalvimrc.patch
Normal file
@ -0,0 +1,16 @@
|
|||||||
|
Index: vim-8.2.2411/src/main.c
|
||||||
|
===================================================================
|
||||||
|
--- vim-8.2.2411.orig/src/main.c
|
||||||
|
+++ vim-8.2.2411/src/main.c
|
||||||
|
@@ -3130,7 +3130,10 @@ source_startup_scripts(mparm_T *parmp)
|
||||||
|
* Get system wide defaults, if the file name is defined.
|
||||||
|
*/
|
||||||
|
#ifdef SYS_VIMRC_FILE
|
||||||
|
- (void)do_source((char_u *)SYS_VIMRC_FILE, FALSE, DOSO_NONE, NULL);
|
||||||
|
+ if (do_source((char_u *)SYS_VIMRC_FILE, FALSE, DOSO_NONE, NULL) == FAIL)
|
||||||
|
+ {
|
||||||
|
+ (void)do_source((char_u *)"$VIMRUNTIME/suse.vimrc", FALSE, DOSO_NONE, NULL);
|
||||||
|
+ }
|
||||||
|
#endif
|
||||||
|
#ifdef MACOS_X
|
||||||
|
(void)do_source((char_u *)"$VIMRUNTIME/macmap.vim", FALSE,
|
@ -9,6 +9,13 @@ Mon Mar 1 13:45:17 UTC 2021 - Matthias Gerstner <matthias.gerstner@suse.com>
|
|||||||
* Maintain leading zeroes in version arguments, otherwise things
|
* Maintain leading zeroes in version arguments, otherwise things
|
||||||
like `vim-changelog.sh 0007 0010` fail to work.
|
like `vim-changelog.sh 0007 0010` fail to work.
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Fri Feb 19 11:03:00 UTC 2021 - Ludwig Nussel <lnussel@suse.de>
|
||||||
|
|
||||||
|
- install suse vimrc in /usr (boo#1182324, vim-8.0.1568-globalvimrc.patch).
|
||||||
|
Add back some settings from defaults.vim that were in suse.vimrc before
|
||||||
|
- prevent double loading of spec.vim
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Thu Feb 18 16:44:25 UTC 2021 - Ludwig Nussel <lnussel@suse.de>
|
Thu Feb 18 16:44:25 UTC 2021 - Ludwig Nussel <lnussel@suse.de>
|
||||||
|
|
||||||
|
2
vim.spec
2
vim.spec
@ -71,6 +71,7 @@ Patch101: vim-8.0.1568-defaults.patch
|
|||||||
# https://github.com/vim/vim/issues/3348 - problem more probadly in buildenv than in test
|
# https://github.com/vim/vim/issues/3348 - problem more probadly in buildenv than in test
|
||||||
Patch102: vim-8.1.0297-dump3.patch
|
Patch102: vim-8.1.0297-dump3.patch
|
||||||
Patch103: no-common.patch
|
Patch103: no-common.patch
|
||||||
|
Patch104: vim-8.2.2411-globalvimrc.patch
|
||||||
BuildRequires: autoconf
|
BuildRequires: autoconf
|
||||||
BuildRequires: db-devel
|
BuildRequires: db-devel
|
||||||
BuildRequires: fdupes
|
BuildRequires: fdupes
|
||||||
@ -191,6 +192,7 @@ cp %{SOURCE23} runtime/syntax/apparmor.vim
|
|||||||
%patch101 -p1
|
%patch101 -p1
|
||||||
%patch102 -p1
|
%patch102 -p1
|
||||||
%patch103 -p1
|
%patch103 -p1
|
||||||
|
%patch104 -p1
|
||||||
cp %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE8} %{SOURCE10} .
|
cp %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE8} %{SOURCE10} .
|
||||||
|
|
||||||
# Unreliable tests
|
# Unreliable tests
|
||||||
|
Loading…
Reference in New Issue
Block a user