To: vim_dev@googlegroups.com
Subject: Patch 8.2.3214
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 8.2.3214
Problem:    MS-Windows: passing /D does not set the install location.
Solution:   Adjust how the installer uses $VIM. Update the documentation.
            (Christian Brabandt, closes #8605)
Files:      nsis/gvim.nsi, runtime/doc/os_win32.txt


*** ../vim-8.2.3213/nsis/gvim.nsi	2021-05-02 13:59:41.881471815 +0200
--- nsis/gvim.nsi	2021-07-24 21:16:48.090606426 +0200
***************
*** 126,135 ****
  # This adds '\Vim' to the user choice automagically.  The actual value is
  # obtained below with CheckOldVim.
  !ifdef WIN64
! InstallDir "$PROGRAMFILES64\Vim"
  !else
! InstallDir "$PROGRAMFILES\Vim"
  !endif
  
  # Types of installs we can perform:
  InstType $(str_type_typical)
--- 126,136 ----
  # This adds '\Vim' to the user choice automagically.  The actual value is
  # obtained below with CheckOldVim.
  !ifdef WIN64
!   !define DEFAULT_INSTDIR "$PROGRAMFILES64\Vim"
  !else
!   !define DEFAULT_INSTDIR "$PROGRAMFILES\Vim"
  !endif
+ InstallDir ${DEFAULT_INSTDIR}
  
  # Types of installs we can perform:
  InstType $(str_type_typical)
***************
*** 710,717 ****
    !insertmacro MUI_LANGDLL_DISPLAY
  !endif
  
!   # Check $VIM
!   ReadEnvStr $INSTDIR "VIM"
  
    call CheckOldVim
    Pop $3
--- 711,723 ----
    !insertmacro MUI_LANGDLL_DISPLAY
  !endif
  
!   ${If} $INSTDIR == ${DEFAULT_INSTDIR}
!     # Check $VIM
!     ReadEnvStr $3 "VIM"
!     ${If} $3 != ""
!       StrCpy $INSTDIR $3
!     ${EndIf}
!   ${EndIf}
  
    call CheckOldVim
    Pop $3
***************
*** 721,740 ****
      SectionSetInstTypes ${id_section_old_ver} 0
      SectionSetText ${id_section_old_ver} ""
    ${Else}
!     ${If} $INSTDIR == ""
        StrCpy $INSTDIR $3
      ${EndIf}
    ${EndIf}
  
-   # If did not find a path: use the default dir.
-   ${If} $INSTDIR == ""
- !ifdef WIN64
-     StrCpy $INSTDIR "$PROGRAMFILES64\Vim"
- !else
-     StrCpy $INSTDIR "$PROGRAMFILES\Vim"
- !endif
-   ${EndIf}
- 
    ${If} ${RunningX64}
      SetRegView 64
    ${EndIf}
--- 727,737 ----
      SectionSetInstTypes ${id_section_old_ver} 0
      SectionSetText ${id_section_old_ver} ""
    ${Else}
!     ${If} $INSTDIR == ${DEFAULT_INSTDIR}
        StrCpy $INSTDIR $3
      ${EndIf}
    ${EndIf}
  
    ${If} ${RunningX64}
      SetRegView 64
    ${EndIf}
*** ../vim-8.2.3213/runtime/doc/os_win32.txt	2021-06-30 20:54:30.696546341 +0200
--- runtime/doc/os_win32.txt	2021-07-24 21:16:48.090606426 +0200
***************
*** 18,24 ****
  4. Using the mouse		|win32-mouse|
  5. Running under Windows 95	|win32-win95|
  6. Running under Windows 3.1	|win32-win3.1|
! 7. Win32 mini FAQ		|win32-faq|
  
  Additionally, there are a number of common Win32 and DOS items:
  File locations			|dos-locations|
--- 18,25 ----
  4. Using the mouse		|win32-mouse|
  5. Running under Windows 95	|win32-win95|
  6. Running under Windows 3.1	|win32-win3.1|
! 7. Installation package		|win32-installer|
! 8. Win32 mini FAQ		|win32-faq|
  
  Additionally, there are a number of common Win32 and DOS items:
  File locations			|dos-locations|
***************
*** 175,181 ****
  Support was removed in patch 7.4.1364.
  
  ==============================================================================
! 7. Win32 mini FAQ					*win32-faq*
  
  Q. How do I change the font?
  A. In the GUI version, you can use the 'guifont' option.  Example: >
--- 176,204 ----
  Support was removed in patch 7.4.1364.
  
  ==============================================================================
! 7. Installation package					*win32-installer*
! 
! A simple installer for windows is available at http://www.vim.org/download.php
! (stable version) and nightly builds are also available at
! https://github.com/vim/vim-win32-installer/releases/
! 
! The nightly builds include 32bit and 64bit builds, have most features enabled
! and usually also contain an extra cryptographic signed installer, so Windows
! will not complain.
! 
! To use the installer, simply run the exe file.  The following switches are
! also supported: >
! 
!     gvim_<version>.exe /S           -> silent install without any dialogues
!     gvim_<version>.exe /D=C:\vim    -> Install into directory c:\vim
!                                     -> /D must be the last argument
!     gvim_<version>.exe /S /D=c:\vim -> silent install into c:\vim
! <
! The default installation directory can alternatively be given by setting the
! $VIM environment variable.
! 
! ==============================================================================
! 8. Win32 mini FAQ					*win32-faq*
  
  Q. How do I change the font?
  A. In the GUI version, you can use the 'guifont' option.  Example: >
*** ../vim-8.2.3213/src/version.c	2021-07-24 20:51:09.444186504 +0200
--- src/version.c	2021-07-24 21:19:06.746190131 +0200
***************
*** 757,758 ****
--- 757,760 ----
  {   /* Add new patch number below this line */
+ /**/
+     3214,
  /**/

-- 
hundred-and-one symptoms of being an internet addict:
229. You spend so much time thinking what to add on this list.

 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
///                                                                      \\\
\\\        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///