Mercurial > vim
comparison 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 |
comparison
equal
deleted
inserted
replaced
9668:7d1ab1664b75 | 9669:284b4eb307fc |
---|---|
1069 | 1069 |
1070 ### Only set VIMRUNTIMEDIR when VIMRTLOC is set to a different location and | 1070 ### Only set VIMRUNTIMEDIR when VIMRTLOC is set to a different location and |
1071 ### the runtime directory is not below it. | 1071 ### the runtime directory is not below it. |
1072 #VIMRUNTIMEDIR = $(VIMRTLOC) | 1072 #VIMRUNTIMEDIR = $(VIMRTLOC) |
1073 | 1073 |
1074 ### Name of the evim file target. | 1074 ### Name of the defaults/evim/mswin file target. |
1075 VIM_DEFAULTS_FILE = $(DESTDIR)$(SCRIPTLOC)/defaults.vim | |
1075 EVIM_FILE = $(DESTDIR)$(SCRIPTLOC)/evim.vim | 1076 EVIM_FILE = $(DESTDIR)$(SCRIPTLOC)/evim.vim |
1076 MSWIN_FILE = $(DESTDIR)$(SCRIPTLOC)/mswin.vim | 1077 MSWIN_FILE = $(DESTDIR)$(SCRIPTLOC)/mswin.vim |
1077 | 1078 |
1078 ### Name of the menu file target. | 1079 ### Name of the menu file target. |
1079 SYS_MENU_FILE = $(DESTDIR)$(SCRIPTLOC)/menu.vim | 1080 SYS_MENU_FILE = $(DESTDIR)$(SCRIPTLOC)/menu.vim |
2238 chmod $(VIMSCRIPTMOD) $(SYS_MENU_FILE) | 2239 chmod $(VIMSCRIPTMOD) $(SYS_MENU_FILE) |
2239 $(INSTALL_DATA) $(SCRIPTSOURCE)/synmenu.vim $(SYS_SYNMENU_FILE) | 2240 $(INSTALL_DATA) $(SCRIPTSOURCE)/synmenu.vim $(SYS_SYNMENU_FILE) |
2240 chmod $(VIMSCRIPTMOD) $(SYS_SYNMENU_FILE) | 2241 chmod $(VIMSCRIPTMOD) $(SYS_SYNMENU_FILE) |
2241 $(INSTALL_DATA) $(SCRIPTSOURCE)/delmenu.vim $(SYS_DELMENU_FILE) | 2242 $(INSTALL_DATA) $(SCRIPTSOURCE)/delmenu.vim $(SYS_DELMENU_FILE) |
2242 chmod $(VIMSCRIPTMOD) $(SYS_DELMENU_FILE) | 2243 chmod $(VIMSCRIPTMOD) $(SYS_DELMENU_FILE) |
2243 # install the evim file | 2244 # install the defaults/evim/mswin file |
2245 $(INSTALL_DATA) $(SCRIPTSOURCE)/defaults.vim $(VIM_DEFAULTS_FILE) | |
2246 chmod $(VIMSCRIPTMOD) $(VIM_DEFAULTS_FILE) | |
2247 $(INSTALL_DATA) $(SCRIPTSOURCE)/evim.vim $(EVIM_FILE) | |
2248 chmod $(VIMSCRIPTMOD) $(EVIM_FILE) | |
2244 $(INSTALL_DATA) $(SCRIPTSOURCE)/mswin.vim $(MSWIN_FILE) | 2249 $(INSTALL_DATA) $(SCRIPTSOURCE)/mswin.vim $(MSWIN_FILE) |
2245 chmod $(VIMSCRIPTMOD) $(MSWIN_FILE) | 2250 chmod $(VIMSCRIPTMOD) $(MSWIN_FILE) |
2246 $(INSTALL_DATA) $(SCRIPTSOURCE)/evim.vim $(EVIM_FILE) | |
2247 chmod $(VIMSCRIPTMOD) $(EVIM_FILE) | |
2248 # install the rgb.txt file | 2251 # install the rgb.txt file |
2249 $(INSTALL_DATA) $(SCRIPTSOURCE)/rgb.txt $(SYS_RGB_FILE) | 2252 $(INSTALL_DATA) $(SCRIPTSOURCE)/rgb.txt $(SYS_RGB_FILE) |
2250 chmod $(VIMSCRIPTMOD) $(SYS_RGB_FILE) | 2253 chmod $(VIMSCRIPTMOD) $(SYS_RGB_FILE) |
2251 # install the bugreport file | 2254 # install the bugreport file |
2252 $(INSTALL_DATA) $(SCRIPTSOURCE)/bugreport.vim $(SYS_BUGR_FILE) | 2255 $(INSTALL_DATA) $(SCRIPTSOURCE)/bugreport.vim $(SYS_BUGR_FILE) |
2610 -rm -f $(DEST_MAN_RU)/xxd.1 $(DEST_MAN_RU_U)/xxd.1 | 2613 -rm -f $(DEST_MAN_RU)/xxd.1 $(DEST_MAN_RU_U)/xxd.1 |
2611 -rm -f $(DEST_HELP)/*.txt $(DEST_HELP)/tags $(DEST_HELP)/*.pl | 2614 -rm -f $(DEST_HELP)/*.txt $(DEST_HELP)/tags $(DEST_HELP)/*.pl |
2612 -rm -f $(DEST_HELP)/*.??x $(DEST_HELP)/tags-?? | 2615 -rm -f $(DEST_HELP)/*.??x $(DEST_HELP)/tags-?? |
2613 -rm -f $(SYS_RGB_FILE) | 2616 -rm -f $(SYS_RGB_FILE) |
2614 -rm -f $(SYS_MENU_FILE) $(SYS_SYNMENU_FILE) $(SYS_DELMENU_FILE) | 2617 -rm -f $(SYS_MENU_FILE) $(SYS_SYNMENU_FILE) $(SYS_DELMENU_FILE) |
2615 -rm -f $(SYS_BUGR_FILE) $(EVIM_FILE) $(MSWIN_FILE) | 2618 -rm -f $(SYS_BUGR_FILE) $(VIM_DEFAULTS_FILE) $(EVIM_FILE) $(MSWIN_FILE) |
2616 -rm -f $(DEST_SCRIPT)/gvimrc_example.vim $(DEST_SCRIPT)/vimrc_example.vim | 2619 -rm -f $(DEST_SCRIPT)/gvimrc_example.vim $(DEST_SCRIPT)/vimrc_example.vim |
2617 -rm -f $(SYS_FILETYPE_FILE) $(SYS_FTOFF_FILE) $(SYS_SCRIPTS_FILE) | 2620 -rm -f $(SYS_FILETYPE_FILE) $(SYS_FTOFF_FILE) $(SYS_SCRIPTS_FILE) |
2618 -rm -f $(SYS_INDOFF_FILE) $(SYS_INDENT_FILE) | 2621 -rm -f $(SYS_INDOFF_FILE) $(SYS_INDENT_FILE) |
2619 -rm -f $(SYS_FTPLUGOF_FILE) $(SYS_FTPLUGIN_FILE) | 2622 -rm -f $(SYS_FTPLUGOF_FILE) $(SYS_FTPLUGIN_FILE) |
2620 -rm -f $(SYS_OPTWIN_FILE) | 2623 -rm -f $(SYS_OPTWIN_FILE) |