Mercurial > vim
diff src/Makefile @ 9669:284b4eb307fc v7.4.2111
commit https://github.com/vim/vim/commit/8c08b5b569e2a9e9f63dea514591ecfa2d3bb392
Author: Bram Moolenaar <Bram@vim.org>
Date: Thu Jul 28 22:24:15 2016 +0200
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.
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Thu, 28 Jul 2016 22:30:05 +0200 |
| parents | 847518911c0b |
| children | adc7212951ee |
line wrap: on
line diff
--- 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 $(DES chmod $(VIMSCRIPTMOD) $(SYS_SYNMENU_FILE) $(INSTALL_DATA) $(SCRIPTSOURCE)/delmenu.vim $(SYS_DELMENU_FILE) chmod $(VIMSCRIPTMOD) $(SYS_DELMENU_FILE) -# install the evim 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_DATA) $(SCRIPTSOURCE)/evim.vim $(EVIM_FILE) - chmod $(VIMSCRIPTMOD) $(EVIM_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)