vim/vim-8.2.2411-globalvimrc.patch
Ismail Dönmez e6ef350dfb 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
2021-03-02 19:20:36 +00:00

17 lines
631 B
Diff

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,