diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-27 02:10:59 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-27 02:10:59 +0000 |
| commit | cccb21df3b4c6fe0aaa99743c418aa973aeebad0 (patch) | |
| tree | 35a2d1f88d47e930fec425da1c1cb89b3ccae6e0 /src/main.c | |
| parent | Releasing progress-linux version 2:9.1.0199-1~progress7.99u1. (diff) | |
| download | vim-cccb21df3b4c6fe0aaa99743c418aa973aeebad0.tar.xz vim-cccb21df3b4c6fe0aaa99743c418aa973aeebad0.zip | |
Merging upstream version 2:9.1.0374.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'src/main.c')
| -rw-r--r-- | src/main.c | 6 |
1 files changed, 5 insertions, 1 deletions
@@ -1098,7 +1098,7 @@ is_safe_now(void) } /* - * Trigger SafeState if currently in s safe state, that is "safe" is TRUE and + * Trigger SafeState if currently in a safe state, that is "safe" is TRUE and * there is no typeahead. */ void @@ -3276,6 +3276,10 @@ source_startup_scripts(mparm_T *parmp) && do_source((char_u *)USR_VIMRC_FILE2, TRUE, DOSO_VIMRC, NULL) == FAIL #endif +#ifdef XDG_VIMRC_FILE + && do_source((char_u *)XDG_VIMRC_FILE, TRUE, + DOSO_VIMRC, NULL) == FAIL +#endif #ifdef USR_VIMRC_FILE3 && do_source((char_u *)USR_VIMRC_FILE3, TRUE, DOSO_VIMRC, NULL) == FAIL |