Mercurial > vim
comparison src/Makefile @ 26057:92c424550367 v8.2.3562
patch 8.2.3562: cannot add color names
Commit: https://github.com/vim/vim/commit/e30d10253fa634c4f60daa798d029245f4eed393
Author: Drew Vogel <dvogel@github>
Date: Sun Oct 24 20:35:07 2021 +0100
patch 8.2.3562: cannot add color names
Problem: Cannot add color names.
Solution: Add the v:colornames dictionary. (Drew Vogel, closes https://github.com/vim/vim/issues/8761)
author | Bram Moolenaar <Bram@vim.org> |
---|---|
date | Sun, 24 Oct 2021 21:45:04 +0200 |
parents | 5792bbdca568 |
children | 597271fb4bfa |
comparison
equal
deleted
inserted
replaced
26056:977bbbf36908 | 26057:92c424550367 |
---|---|
1133 SYS_SYNMENU_FILE = $(DESTDIR)$(SCRIPTLOC)/synmenu.vim | 1133 SYS_SYNMENU_FILE = $(DESTDIR)$(SCRIPTLOC)/synmenu.vim |
1134 SYS_DELMENU_FILE = $(DESTDIR)$(SCRIPTLOC)/delmenu.vim | 1134 SYS_DELMENU_FILE = $(DESTDIR)$(SCRIPTLOC)/delmenu.vim |
1135 | 1135 |
1136 ### Name of the bugreport file target. | 1136 ### Name of the bugreport file target. |
1137 SYS_BUGR_FILE = $(DESTDIR)$(SCRIPTLOC)/bugreport.vim | 1137 SYS_BUGR_FILE = $(DESTDIR)$(SCRIPTLOC)/bugreport.vim |
1138 | |
1139 ### Name of the rgb.txt file target. | |
1140 SYS_RGB_FILE = $(DESTDIR)$(SCRIPTLOC)/rgb.txt | |
1141 | 1138 |
1142 ### Name of the file type detection file target. | 1139 ### Name of the file type detection file target. |
1143 SYS_FILETYPE_FILE = $(DESTDIR)$(SCRIPTLOC)/filetype.vim | 1140 SYS_FILETYPE_FILE = $(DESTDIR)$(SCRIPTLOC)/filetype.vim |
1144 | 1141 |
1145 ### Name of the file type detection file target. | 1142 ### Name of the file type detection file target. |
2447 chmod $(VIMSCRIPTMOD) $(VIM_DEFAULTS_FILE) | 2444 chmod $(VIMSCRIPTMOD) $(VIM_DEFAULTS_FILE) |
2448 $(INSTALL_DATA) $(SCRIPTSOURCE)/evim.vim $(EVIM_FILE) | 2445 $(INSTALL_DATA) $(SCRIPTSOURCE)/evim.vim $(EVIM_FILE) |
2449 chmod $(VIMSCRIPTMOD) $(EVIM_FILE) | 2446 chmod $(VIMSCRIPTMOD) $(EVIM_FILE) |
2450 $(INSTALL_DATA) $(SCRIPTSOURCE)/mswin.vim $(MSWIN_FILE) | 2447 $(INSTALL_DATA) $(SCRIPTSOURCE)/mswin.vim $(MSWIN_FILE) |
2451 chmod $(VIMSCRIPTMOD) $(MSWIN_FILE) | 2448 chmod $(VIMSCRIPTMOD) $(MSWIN_FILE) |
2452 # install the rgb.txt file | |
2453 $(INSTALL_DATA) $(SCRIPTSOURCE)/rgb.txt $(SYS_RGB_FILE) | |
2454 chmod $(VIMSCRIPTMOD) $(SYS_RGB_FILE) | |
2455 # install the bugreport file | 2449 # install the bugreport file |
2456 $(INSTALL_DATA) $(SCRIPTSOURCE)/bugreport.vim $(SYS_BUGR_FILE) | 2450 $(INSTALL_DATA) $(SCRIPTSOURCE)/bugreport.vim $(SYS_BUGR_FILE) |
2457 chmod $(VIMSCRIPTMOD) $(SYS_BUGR_FILE) | 2451 chmod $(VIMSCRIPTMOD) $(SYS_BUGR_FILE) |
2458 # install the example vimrc files | 2452 # install the example vimrc files |
2459 $(INSTALL_DATA) $(SCRIPTSOURCE)/vimrc_example.vim $(DEST_SCRIPT) | 2453 $(INSTALL_DATA) $(SCRIPTSOURCE)/vimrc_example.vim $(DEST_SCRIPT) |
2479 chmod $(VIMSCRIPTMOD) $(SYS_OPTWIN_FILE) | 2473 chmod $(VIMSCRIPTMOD) $(SYS_OPTWIN_FILE) |
2480 # install the print resource files | 2474 # install the print resource files |
2481 cd $(PRINTSOURCE); $(INSTALL_DATA) *.ps $(DEST_PRINT) | 2475 cd $(PRINTSOURCE); $(INSTALL_DATA) *.ps $(DEST_PRINT) |
2482 cd $(DEST_PRINT); chmod $(FILEMOD) *.ps | 2476 cd $(DEST_PRINT); chmod $(FILEMOD) *.ps |
2483 # install the colorscheme files | 2477 # install the colorscheme files |
2484 cd $(COLSOURCE); $(INSTALL_DATA_R) *.vim tools README.txt $(DEST_COL) | 2478 cd $(COLSOURCE); $(INSTALL_DATA_R) *.vim lists tools README.txt $(DEST_COL) |
2485 cd $(DEST_COL); chmod $(DIRMOD) tools | 2479 cd $(DEST_COL); chmod $(DIRMOD) tools |
2486 cd $(DEST_COL); chmod $(HELPMOD) *.vim README.txt tools/*.vim | 2480 cd $(DEST_COL); chmod $(HELPMOD) *.vim README.txt tools/*.vim |
2487 # install the syntax files | 2481 # install the syntax files |
2488 cd $(SYNSOURCE); $(INSTALL_DATA) *.vim README.txt $(DEST_SYN) | 2482 cd $(SYNSOURCE); $(INSTALL_DATA) *.vim README.txt $(DEST_SYN) |
2489 cd $(DEST_SYN); chmod $(HELPMOD) *.vim README.txt | 2483 cd $(DEST_SYN); chmod $(HELPMOD) *.vim README.txt |
2892 -rm -f $(DEST_MAN_JA_U)/xxd.1 | 2886 -rm -f $(DEST_MAN_JA_U)/xxd.1 |
2893 -rm -f $(DEST_MAN_PL)/xxd.1 $(DEST_MAN_PL_I)/xxd.1 $(DEST_MAN_PL_U)/xxd.1 | 2887 -rm -f $(DEST_MAN_PL)/xxd.1 $(DEST_MAN_PL_I)/xxd.1 $(DEST_MAN_PL_U)/xxd.1 |
2894 -rm -f $(DEST_MAN_RU)/xxd.1 $(DEST_MAN_RU_U)/xxd.1 | 2888 -rm -f $(DEST_MAN_RU)/xxd.1 $(DEST_MAN_RU_U)/xxd.1 |
2895 -rm -f $(DEST_HELP)/*.txt $(DEST_HELP)/tags $(DEST_HELP)/*.pl | 2889 -rm -f $(DEST_HELP)/*.txt $(DEST_HELP)/tags $(DEST_HELP)/*.pl |
2896 -rm -f $(DEST_HELP)/*.??x $(DEST_HELP)/tags-?? | 2890 -rm -f $(DEST_HELP)/*.??x $(DEST_HELP)/tags-?? |
2897 -rm -f $(SYS_RGB_FILE) | |
2898 -rm -f $(SYS_MENU_FILE) $(SYS_SYNMENU_FILE) $(SYS_DELMENU_FILE) | 2891 -rm -f $(SYS_MENU_FILE) $(SYS_SYNMENU_FILE) $(SYS_DELMENU_FILE) |
2899 -rm -f $(SYS_BUGR_FILE) $(VIM_DEFAULTS_FILE) $(EVIM_FILE) $(MSWIN_FILE) | 2892 -rm -f $(SYS_BUGR_FILE) $(VIM_DEFAULTS_FILE) $(EVIM_FILE) $(MSWIN_FILE) |
2900 -rm -f $(DEST_SCRIPT)/gvimrc_example.vim $(DEST_SCRIPT)/vimrc_example.vim | 2893 -rm -f $(DEST_SCRIPT)/gvimrc_example.vim $(DEST_SCRIPT)/vimrc_example.vim |
2901 -rm -f $(SYS_FILETYPE_FILE) $(SYS_FTOFF_FILE) $(SYS_SCRIPTS_FILE) | 2894 -rm -f $(SYS_FILETYPE_FILE) $(SYS_FTOFF_FILE) $(SYS_SCRIPTS_FILE) |
2902 -rm -f $(SYS_INDOFF_FILE) $(SYS_INDENT_FILE) | 2895 -rm -f $(SYS_INDOFF_FILE) $(SYS_INDENT_FILE) |
3664 # Haiku installation | 3657 # Haiku installation |
3665 # | 3658 # |
3666 # This rule: | 3659 # This rule: |
3667 # - add resources to already installed vim binary to avoid | 3660 # - add resources to already installed vim binary to avoid |
3668 # stripping them during install; | 3661 # stripping them during install; |
3669 # - copy rgb.txt to runtime directory; | |
3670 # - update system MIME database with info about vim application. | 3662 # - update system MIME database with info about vim application. |
3671 # | 3663 # |
3672 install_haiku_extra: $(DEST_BIN)/$(VIMTARGET) objects/os_haiku.rsrc | 3664 install_haiku_extra: $(DEST_BIN)/$(VIMTARGET) objects/os_haiku.rsrc |
3673 xres -o $(DEST_BIN)/$(VIMTARGET) objects/os_haiku.rsrc | 3665 xres -o $(DEST_BIN)/$(VIMTARGET) objects/os_haiku.rsrc |
3674 $(INSTALL_DATA) $(SCRIPTSOURCE)/rgb.txt $(DEST_RT) | |
3675 mimeset $(DEST_BIN)/$(VIMTARGET) | 3666 mimeset $(DEST_BIN)/$(VIMTARGET) |
3676 | 3667 |
3677 # List of g*-links that should be replaced with shell script equivalents. | 3668 # List of g*-links that should be replaced with shell script equivalents. |
3678 # This solves the problem of them from Tracker. | 3669 # This solves the problem of them from Tracker. |
3679 # | 3670 # |