diff options
| author | Bram Moolenaar <Bram@vim.org> | 2016-07-28 22:24:15 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2016-07-28 22:24:15 +0200 |
| commit | 8c08b5b569e2a9e9f63dea514591ecfa2d3bb392 (patch) | |
| tree | 4303829cd42d4910ee0d0dfc35687c7b313c5e14 /src/Makefile | |
| parent | eac784eced501c54d2c99e18a1af96cd996f3a6c (diff) | |
| download | vim-8c08b5b569e2a9e9f63dea514591ecfa2d3bb392.zip | |
patch 7.4.2111
Problem: Defaults are very conservative.
Solution: Move settings from vimrc_example.vim to defaults.vim. Load
defaults.vim if no .vimrc was found.
Diffstat (limited to 'src/Makefile')
| -rw-r--r-- | src/Makefile | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/src/Makefile b/src/Makefile index 001f87a3f..ea28eb715 100644 --- a/src/Makefile +++ b/src/Makefile @@ -1071,7 +1071,8 @@ SCRIPTLOC = $(VIMRTLOC) ### the runtime directory is not below it. #VIMRUNTIMEDIR = $(VIMRTLOC) -### Name of the evim file target. +### Name of the defaults/evim/mswin file target. +VIM_DEFAULTS_FILE = $(DESTDIR)$(SCRIPTLOC)/defaults.vim EVIM_FILE = $(DESTDIR)$(SCRIPTLOC)/evim.vim MSWIN_FILE = $(DESTDIR)$(SCRIPTLOC)/mswin.vim @@ -2240,11 +2241,13 @@ installrtbase: $(HELPSOURCE)/vim.1 $(DEST_VIM) $(DEST_RT) \ chmod $(VIMSCRIPTMOD) $(SYS_SYNMENU_FILE) $(INSTALL_DATA) $(SCRIPTSOURCE)/delmenu.vim $(SYS_DELMENU_FILE) chmod $(VIMSCRIPTMOD) $(SYS_DELMENU_FILE) -# install the evim file - $(INSTALL_DATA) $(SCRIPTSOURCE)/mswin.vim $(MSWIN_FILE) - chmod $(VIMSCRIPTMOD) $(MSWIN_FILE) +# install the defaults/evim/mswin file + $(INSTALL_DATA) $(SCRIPTSOURCE)/defaults.vim $(VIM_DEFAULTS_FILE) + chmod $(VIMSCRIPTMOD) $(VIM_DEFAULTS_FILE) $(INSTALL_DATA) $(SCRIPTSOURCE)/evim.vim $(EVIM_FILE) chmod $(VIMSCRIPTMOD) $(EVIM_FILE) + $(INSTALL_DATA) $(SCRIPTSOURCE)/mswin.vim $(MSWIN_FILE) + chmod $(VIMSCRIPTMOD) $(MSWIN_FILE) # install the rgb.txt file $(INSTALL_DATA) $(SCRIPTSOURCE)/rgb.txt $(SYS_RGB_FILE) chmod $(VIMSCRIPTMOD) $(SYS_RGB_FILE) @@ -2612,7 +2615,7 @@ uninstall_runtime: -rm -f $(DEST_HELP)/*.??x $(DEST_HELP)/tags-?? -rm -f $(SYS_RGB_FILE) -rm -f $(SYS_MENU_FILE) $(SYS_SYNMENU_FILE) $(SYS_DELMENU_FILE) - -rm -f $(SYS_BUGR_FILE) $(EVIM_FILE) $(MSWIN_FILE) + -rm -f $(SYS_BUGR_FILE) $(VIM_DEFAULTS_FILE) $(EVIM_FILE) $(MSWIN_FILE) -rm -f $(DEST_SCRIPT)/gvimrc_example.vim $(DEST_SCRIPT)/vimrc_example.vim -rm -f $(SYS_FILETYPE_FILE) $(SYS_FTOFF_FILE) $(SYS_SCRIPTS_FILE) -rm -f $(SYS_INDOFF_FILE) $(SYS_INDENT_FILE) |