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 #6451)

diff --git a/nsis/gvim.nsi b/nsis/gvim.nsi
index 2b40e4b0db6cde83c73cda4d2fc85eaee0136684..65ac8b11f48bc7c111f3892e3697739441007283 100644 (file)
--- a/nsis/gvim.nsi
+++ b/nsis/gvim.nsi
@@ -687,6 +687,15 @@ SectionEnd
        ${EndIf}
 !macroend
 
+!macro LoadDefaultVimrc out_var reg_value default_value
+       ClearErrors
+       ReadRegStr ${out_var} HKLM "${UNINST_REG_KEY_VIM}" ${reg_value}
+       ${If} ${Errors}
+       ${OrIf} ${out_var} == ""
+         StrCpy ${out_var} ${default_value}
+       ${EndIf}
+!macroend
+
 Function .onInit
 !ifdef HAVE_MULTI_LANG
   # Select a language (or read from the registry).
@@ -718,10 +727,10 @@ Function .onInit
 !endif
   ${EndIf}
 
-# Load the selections from the registry (if any).
   ${If} ${RunningX64}
     SetRegView 64
   ${EndIf}
+  # Load the selections from the registry (if any).
   !insertmacro LoadSectionSelection ${id_section_console}    "select_console"
   !insertmacro LoadSectionSelection ${id_section_batch}      "select_batch"
   !insertmacro LoadSectionSelection ${id_section_desktop}    "select_desktop"
@@ -736,6 +745,10 @@ Function .onInit
 !ifdef HAVE_NLS
   !insertmacro LoadSectionSelection ${id_section_nls}        "select_nls"
 !endif
+  # Load the default _vimrc settings from the registry (if any).
+  !insertmacro LoadDefaultVimrc $vim_compat_stat "vim_compat" "all"
+  !insertmacro LoadDefaultVimrc $vim_keymap_stat "vim_keyremap" "default"
+  !insertmacro LoadDefaultVimrc $vim_mouse_stat "vim_mouse" "default"
   ${If} ${RunningX64}
     SetRegView lastused
   ${EndIf}
@@ -799,17 +812,11 @@ Function SetCustom
        ${NSD_CB_AddString} $vim_nsd_compat $(str_msg_compat_defaults)
        ${NSD_CB_AddString} $vim_nsd_compat $(str_msg_compat_all)
 
-       # Default selection
-       ${If} $vim_compat_stat == ""
-         ReadRegStr $3 HKLM "${UNINST_REG_KEY_VIM}" "vim_compat"
-       ${Else}
-         StrCpy $3 $vim_compat_stat
-       ${EndIf}
-       ${If} $3 == "defaults"
+       ${If} $vim_compat_stat == "defaults"
          StrCpy $4 2
-       ${ElseIf} $3 == "vim"
+       ${ElseIf} $vim_compat_stat == "vim"
          StrCpy $4 1
-       ${ElseIf} $3 == "vi"
+       ${ElseIf} $vim_compat_stat == "vi"
          StrCpy $4 0
        ${Else} # default
          StrCpy $4 3
@@ -828,13 +835,7 @@ Function SetCustom
        ${NSD_CB_AddString} $vim_nsd_keymap $(str_msg_keymap_default)
        ${NSD_CB_AddString} $vim_nsd_keymap $(str_msg_keymap_windows)
 
-       # Default selection
-       ${If} $vim_keymap_stat == ""
-         ReadRegStr $3 HKLM "${UNINST_REG_KEY_VIM}" "vim_keyremap"
-       ${Else}
-         StrCpy $3 $vim_keymap_stat
-       ${EndIf}
-       ${If} $3 == "windows"
+       ${If} $vim_keymap_stat == "windows"
          StrCpy $4 1
        ${Else} # default
          StrCpy $4 0
@@ -854,15 +855,9 @@ Function SetCustom
        ${NSD_CB_AddString} $vim_nsd_mouse $(str_msg_mouse_windows)
        ${NSD_CB_AddString} $vim_nsd_mouse $(str_msg_mouse_unix)
 
-       # Default selection
-       ${If} $vim_mouse_stat == ""
-         ReadRegStr $3 HKLM "${UNINST_REG_KEY_VIM}" "vim_mouse"
-       ${Else}
-         StrCpy $3 $vim_mouse_stat
-       ${EndIf}
-       ${If} $3 == "xterm"
+       ${If} $vim_mouse_stat == "xterm"
          StrCpy $4 2
-       ${ElseIf} $3 == "windows"
+       ${ElseIf} $vim_mouse_stat == "windows"
          StrCpy $4 1
        ${Else} # default
          StrCpy $4 0

diff --git a/src/version.c b/src/version.c
index 3a7067fa6b23a55d0e4812e2f5d1b3f34dda4f73..4727aebd2fc5e5e8561e0e131d1d0f40046c350d 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -754,6 +754,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1214,
 /**/
     1213,
 /**/