Mercurial > vim

comparison nsis/gvim.nsi @ 21327:ec2f5f0b5dcb v8.2.1214

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.2.1214: MS-Windows: default _vimrc not correct in silent install mode Commit: https://github.com/vim/vim/commit/ceb56ddbafbca01e52ff4291d9480bf83d739793 Author: Bram Moolenaar <Bram@vim.org> Date: Tue Jul 14 22:24:40 2020 +0200 patch 8.2.1214: MS-Windows: default _vimrc not correct in silent install mode Problem: MS-Windows: default _vimrc not correct in silent install mode. Solution: Add the LoadDefaultVimrc macro. (Ken Takata, closes https://github.com/vim/vim/issues/6451)
author Bram Moolenaar <Bram@vim.org>
date Tue, 14 Jul 2020 22:30:04 +0200
parents e548f5ed3645
children 7edf403da9f5
comparison
equal deleted inserted replaced
21326:93fa32776b08 21327:ec2f5f0b5dcb
685 !insertmacro UnselectSection ${section_id} 685 !insertmacro UnselectSection ${section_id}
686 ${EndIf} 686 ${EndIf}
687 ${EndIf} 687 ${EndIf}
688 !macroend 688 !macroend
689 689
690 !macro LoadDefaultVimrc out_var reg_value default_value
691 ClearErrors
692 ReadRegStr ${out_var} HKLM "${UNINST_REG_KEY_VIM}" ${reg_value}
693 ${If} ${Errors}
694 ${OrIf} ${out_var} == ""
695 StrCpy ${out_var} ${default_value}
696 ${EndIf}
697 !macroend
698
690 Function .onInit 699 Function .onInit
691 !ifdef HAVE_MULTI_LANG 700 !ifdef HAVE_MULTI_LANG
692 # Select a language (or read from the registry). 701 # Select a language (or read from the registry).
693 !insertmacro MUI_LANGDLL_DISPLAY 702 !insertmacro MUI_LANGDLL_DISPLAY
694 !endif 703 !endif
716 !else 725 !else
717 StrCpy $INSTDIR "$PROGRAMFILES\Vim" 726 StrCpy $INSTDIR "$PROGRAMFILES\Vim"
718 !endif 727 !endif
719 ${EndIf} 728 ${EndIf}
720 729
721 # Load the selections from the registry (if any).
722 ${If} ${RunningX64} 730 ${If} ${RunningX64}
723 SetRegView 64 731 SetRegView 64
724 ${EndIf} 732 ${EndIf}
733 # Load the selections from the registry (if any).
725 !insertmacro LoadSectionSelection ${id_section_console} "select_console" 734 !insertmacro LoadSectionSelection ${id_section_console} "select_console"
726 !insertmacro LoadSectionSelection ${id_section_batch} "select_batch" 735 !insertmacro LoadSectionSelection ${id_section_batch} "select_batch"
727 !insertmacro LoadSectionSelection ${id_section_desktop} "select_desktop" 736 !insertmacro LoadSectionSelection ${id_section_desktop} "select_desktop"
728 !insertmacro LoadSectionSelection ${id_section_startmenu} "select_startmenu" 737 !insertmacro LoadSectionSelection ${id_section_startmenu} "select_startmenu"
729 !insertmacro LoadSectionSelection ${id_section_editwith} "select_editwith" 738 !insertmacro LoadSectionSelection ${id_section_editwith} "select_editwith"
734 !insertmacro LoadSectionSelection ${id_section_visvim} "select_visvim" 743 !insertmacro LoadSectionSelection ${id_section_visvim} "select_visvim"
735 !endif 744 !endif
736 !ifdef HAVE_NLS 745 !ifdef HAVE_NLS
737 !insertmacro LoadSectionSelection ${id_section_nls} "select_nls" 746 !insertmacro LoadSectionSelection ${id_section_nls} "select_nls"
738 !endif 747 !endif
748 # Load the default _vimrc settings from the registry (if any).
749 !insertmacro LoadDefaultVimrc $vim_compat_stat "vim_compat" "all"
750 !insertmacro LoadDefaultVimrc $vim_keymap_stat "vim_keyremap" "default"
751 !insertmacro LoadDefaultVimrc $vim_mouse_stat "vim_mouse" "default"
739 ${If} ${RunningX64} 752 ${If} ${RunningX64}
740 SetRegView lastused 753 SetRegView lastused
741 ${EndIf} 754 ${EndIf}
742 755
743 # User variables: 756 # User variables:
797 ${NSD_CB_AddString} $vim_nsd_compat $(str_msg_compat_vi) 810 ${NSD_CB_AddString} $vim_nsd_compat $(str_msg_compat_vi)
798 ${NSD_CB_AddString} $vim_nsd_compat $(str_msg_compat_vim) 811 ${NSD_CB_AddString} $vim_nsd_compat $(str_msg_compat_vim)
799 ${NSD_CB_AddString} $vim_nsd_compat $(str_msg_compat_defaults) 812 ${NSD_CB_AddString} $vim_nsd_compat $(str_msg_compat_defaults)
800 ${NSD_CB_AddString} $vim_nsd_compat $(str_msg_compat_all) 813 ${NSD_CB_AddString} $vim_nsd_compat $(str_msg_compat_all)
801 814
802 # Default selection 815 ${If} $vim_compat_stat == "defaults"
803 ${If} $vim_compat_stat == ""
804 ReadRegStr $3 HKLM "${UNINST_REG_KEY_VIM}" "vim_compat"
805 ${Else}
806 StrCpy $3 $vim_compat_stat
807 ${EndIf}
808 ${If} $3 == "defaults"
809 StrCpy $4 2 816 StrCpy $4 2
810 ${ElseIf} $3 == "vim" 817 ${ElseIf} $vim_compat_stat == "vim"
811 StrCpy $4 1 818 StrCpy $4 1
812 ${ElseIf} $3 == "vi" 819 ${ElseIf} $vim_compat_stat == "vi"
813 StrCpy $4 0 820 StrCpy $4 0
814 ${Else} # default 821 ${Else} # default
815 StrCpy $4 3 822 StrCpy $4 3
816 ${EndIf} 823 ${EndIf}
817 ${NSD_CB_SetSelectionIndex} $vim_nsd_compat $4 824 ${NSD_CB_SetSelectionIndex} $vim_nsd_compat $4
826 ${NSD_CreateDropList} 38% 54% 55% 8% "" 833 ${NSD_CreateDropList} 38% 54% 55% 8% ""
827 Pop $vim_nsd_keymap 834 Pop $vim_nsd_keymap
828 ${NSD_CB_AddString} $vim_nsd_keymap $(str_msg_keymap_default) 835 ${NSD_CB_AddString} $vim_nsd_keymap $(str_msg_keymap_default)
829 ${NSD_CB_AddString} $vim_nsd_keymap $(str_msg_keymap_windows) 836 ${NSD_CB_AddString} $vim_nsd_keymap $(str_msg_keymap_windows)
830 837
831 # Default selection 838 ${If} $vim_keymap_stat == "windows"
832 ${If} $vim_keymap_stat == ""
833 ReadRegStr $3 HKLM "${UNINST_REG_KEY_VIM}" "vim_keyremap"
834 ${Else}
835 StrCpy $3 $vim_keymap_stat
836 ${EndIf}
837 ${If} $3 == "windows"
838 StrCpy $4 1 839 StrCpy $4 1
839 ${Else} # default 840 ${Else} # default
840 StrCpy $4 0 841 StrCpy $4 0
841 ${EndIf} 842 ${EndIf}
842 ${NSD_CB_SetSelectionIndex} $vim_nsd_keymap $4 843 ${NSD_CB_SetSelectionIndex} $vim_nsd_keymap $4
852 Pop $vim_nsd_mouse 853 Pop $vim_nsd_mouse
853 ${NSD_CB_AddString} $vim_nsd_mouse $(str_msg_mouse_default) 854 ${NSD_CB_AddString} $vim_nsd_mouse $(str_msg_mouse_default)
854 ${NSD_CB_AddString} $vim_nsd_mouse $(str_msg_mouse_windows) 855 ${NSD_CB_AddString} $vim_nsd_mouse $(str_msg_mouse_windows)
855 ${NSD_CB_AddString} $vim_nsd_mouse $(str_msg_mouse_unix) 856 ${NSD_CB_AddString} $vim_nsd_mouse $(str_msg_mouse_unix)
856 857
857 # Default selection 858 ${If} $vim_mouse_stat == "xterm"
858 ${If} $vim_mouse_stat == ""
859 ReadRegStr $3 HKLM "${UNINST_REG_KEY_VIM}" "vim_mouse"
860 ${Else}
861 StrCpy $3 $vim_mouse_stat
862 ${EndIf}
863 ${If} $3 == "xterm"
864 StrCpy $4 2 859 StrCpy $4 2
865 ${ElseIf} $3 == "windows" 860 ${ElseIf} $vim_mouse_stat == "windows"
866 StrCpy $4 1 861 StrCpy $4 1
867 ${Else} # default 862 ${Else} # default
868 StrCpy $4 0 863 StrCpy $4 0
869 ${EndIf} 864 ${EndIf}
870 ${NSD_CB_SetSelectionIndex} $vim_nsd_mouse $4 865 ${NSD_CB_SetSelectionIndex} $vim_nsd_mouse $4