From cea0fd869373ffc02c3448f18f26a65baef57cac Mon Sep 17 00:00:00 2001
From: anders_k <anders_k@212acab6-be3b-0410-9dea-997c60f758d6>
Date: Fri, 30 Dec 2016 00:00:35 +0000
Subject: [PATCH] Added support for MUI_UNCONFIRMPAGE_VARIABLE (RFE #511)

git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6831 212acab6-be3b-0410-9dea-997c60f758d6
---
 Contrib/Modern UI 2/Pages/UninstallConfirm.nsh | 4 ++++
 Contrib/Modern UI 2/Readme.html                | 4 ++++
 Contrib/Modern UI/Readme.html                  | 4 ++++
 Contrib/Modern UI/System.nsh                   | 4 ++++
 Docs/src/history.but                           | 6 ++++--
 5 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/Contrib/Modern UI 2/Pages/UninstallConfirm.nsh b/Contrib/Modern UI 2/Pages/UninstallConfirm.nsh
index a9323ee3..1ebe927d 100644
--- a/Contrib/Modern UI 2/Pages/UninstallConfirm.nsh	
+++ b/Contrib/Modern UI 2/Pages/UninstallConfirm.nsh	
@@ -41,6 +41,10 @@ Uninstall confirmation page
 
     UninstallText "${MUI_UNCONFIRMPAGE_TEXT_TOP}" "${MUI_UNCONFIRMPAGE_TEXT_LOCATION}"
 
+    !ifdef MUI_UNCONFIRMPAGE_VARIABLE
+      DirVar "${MUI_UNCONFIRMPAGE_VARIABLE}"
+    !endif
+
   PageExEnd
 
   !insertmacro MUI_UNFUNCTION_CONFIRMPAGE un.mui.ConfirmPre_${MUI_UNIQUEID} un.mui.ConfirmShow_${MUI_UNIQUEID} un.mui.ConfirmLeave_${MUI_UNIQUEID}
diff --git a/Contrib/Modern UI 2/Readme.html b/Contrib/Modern UI 2/Readme.html
index b6bf419b..89846e8b 100644
--- a/Contrib/Modern UI 2/Readme.html	
+++ b/Contrib/Modern UI 2/Readme.html	
@@ -855,6 +855,10 @@ Var PLUGINS_FOLDER
                                     <p>
                                         <strong>MUI_UNCONFIRMPAGE_TEXT_LOCATION</strong> <span class="parameter">text</span><br />
                                         Text to display next to the uninstall location text box.</p>
+                                    <p>
+                                        <strong>MUI_UNCONFIRMPAGE_VARIABLE</strong> <span class="parameter">variable</span><br />
+                                        Variable in which to store the uninstall source folder.<br />
+                                        <em>Default: $INSTDIR</em></p>
                                 </div>
                         </div>
                     </div>
diff --git a/Contrib/Modern UI/Readme.html b/Contrib/Modern UI/Readme.html
index 3d83f90f..40af89c9 100644
--- a/Contrib/Modern UI/Readme.html	
+++ b/Contrib/Modern UI/Readme.html	
@@ -845,6 +845,10 @@ Var PLUGINS_FOLDER
                                         <p>
                                             <strong>MUI_UNCONFIRMPAGE_TEXT_LOCATION</strong> <span class="parameter">text</span><br />
                                             Text to display next to the uninstall location text box.</p>
+                                        <p>
+                                            <strong>MUI_UNCONFIRMPAGE_VARIABLE</strong> <span class="parameter">variable</span><br />
+                                        Variable in which to store the uninstall source folder.<br />
+                                        <em>Default: $INSTDIR</em></p>
                                     </div>
                             </div>
                         </div>
diff --git a/Contrib/Modern UI/System.nsh b/Contrib/Modern UI/System.nsh
index 4a60b923..648f7fd9 100644
--- a/Contrib/Modern UI/System.nsh	
+++ b/Contrib/Modern UI/System.nsh	
@@ -1123,6 +1123,10 @@ Var MUI_TEMP2
 
     UninstallText "${MUI_UNCONFIRMPAGE_TEXT_TOP}" "${MUI_UNCONFIRMPAGE_TEXT_LOCATION}"
 
+    !ifdef MUI_UNCONFIRMPAGE_VARIABLE
+      DirVar "${MUI_UNCONFIRMPAGE_VARIABLE}"
+    !endif
+
   PageExEnd
 
   !insertmacro MUI_UNFUNCTION_CONFIRMPAGE un.mui.ConfirmPre_${MUI_UNIQUEID} un.mui.ConfirmShow_${MUI_UNIQUEID} un.mui.ConfirmLeave_${MUI_UNIQUEID}
diff --git a/Docs/src/history.but b/Docs/src/history.but
index 92e1a300..907759e2 100644
--- a/Docs/src/history.but
+++ b/Docs/src/history.but
@@ -1,6 +1,6 @@
 \A{history} Changelog and Release Notes
 
-\H{v3.01} 3.02
+\H{v3.02} 3.02
 
 Released on ? ?th, 2017
 
@@ -14,6 +14,8 @@ Released on ? ?th, 2017
 
 \b MultiUser now supports $ProgramFiles64 (\W{http://sf.net/p/nsis/bugs/843}{bug #843})
 
+\b Added support for MUI_UNCONFIRMPAGE_VARIABLE (\W{http://sf.net/p/nsis/feature-requests/511}{RFE #511})
+
 \S2{} Translations
 
 \b Minor French improvements (\W{http://sf.net/p/nsis/patches/221}{patch #221})
@@ -3253,7 +3255,7 @@ Released on December 6th, 2002
 
 \b !ifdef and friends can now be used in macros
 
-\b \R{sendmessage}{SendMessage} can send strings (put cw{STR:} before a param) and supports timeouts
+\b \R{sendmessage}{SendMessage} can send strings (put \cw{STR:} before a param) and supports timeouts
 
 \b Right mouse button "Copy to clipboard" context menu for the Details window