UPD: Merge fixes from 0.7 branch (6683-6685,6691,6695-6698)

install/darwin/install.sh

@@ -54,7 +54,6 @@ install -m 644 plugins/wfx/ftp/lib/ftp.wfx          $DC_INSTALL_DIR/plugins/wfx/
 
 # Copy documentation
 mkdir -p $DC_INSTALL_DIR/doc
-cp -r doc/en    $DC_INSTALL_DIR/doc/
 cp -a doc/*.txt $DC_INSTALL_DIR/doc/
 
 # Copy scripts

install/linux/convert-rpm-txz.sh

@@ -71,8 +71,6 @@ popd
 
 # Copy script for execute portable version
 install -m 755 $DC_SOURCE_DIR/doublecmd.sh       $DC_ROOT_DIR/
-# Copy help files
-cp -r $DC_SOURCE_DIR/doc/en                      $DC_ROOT_DIR/doc
 
 # Make portable config file
 sed -i -e 's/<UseConfigInProgramDir>False/<UseConfigInProgramDir>True/' $DC_ROOT_DIR/doublecmd.xml

install/linux/deb/doublecmd/patches/x-terminal-emulator.patch

@@ -1,17 +1,21 @@
 Description: Change default terminal command to 'x-terminal-emulator'
 Author: Graham Inggs <graham@nerve.org.za>
 Forwarded: not-needed
-Last-Update: 2015-02-15
+Last-Update: 2016-03-13
 --- a/src/platform/uOSUtils.pas
 +++ b/src/platform/uOSUtils.pas
-@@ -53,8 +53,8 @@
-   fmtRunInTerm = '';
+@@ -63,11 +63,11 @@
+   RunInTermCloseParams = '';
    MonoSpaceFont = 'Monaco';
    {$ELSE}
--  RunTerm = 'xterm';  // default terminal
--  RunInTerm = 'xterm -e sh -c'; // default run in terminal command
-+  RunTerm = 'x-terminal-emulator';  // default terminal
-+  RunInTerm = 'x-terminal-emulator -e sh -c'; // default run in terminal command
-   fmtRunInTerm = '%s ''%s ; echo -n Press ENTER to exit... ; read a''';
+-  RunTermCmd = 'xterm';  // default terminal
++  RunTermCmd = 'x-terminal-emulator';  // default terminal
+   RunTermParams = '';
+-  RunInTermStayOpenCmd = 'xterm'; // default run in terminal command AND Stay open after command
++  RunInTermStayOpenCmd = 'x-terminal-emulator'; // default run in terminal command AND Stay open after command
+   RunInTermStayOpenParams = '-e sh -c ''{command}; echo -n Press ENTER to exit... ; read a''';
+-  RunInTermCloseCmd = 'xterm'; // default run in terminal command AND Close after command
++  RunInTermCloseCmd = 'x-terminal-emulator'; // default run in terminal command AND Close after command
+   RunInTermCloseParams = '-e sh -c {command}';
    MonoSpaceFont = 'Monospace';
    {$ENDIF}

install/linux/update-repo-obs.sh

@@ -30,11 +30,6 @@ update_doublecmd()
   # Save revision number
   DC_REVISION=`$(pwd)/update-revision.sh ../../ $DC_SOURCE_DIR`
 
-  # Remove help files
-  rm -rf $DC_SOURCE_DIR/doc/en
-  rm -rf $DC_SOURCE_DIR/doc/ru
-  rm -rf $DC_SOURCE_DIR/doc/uk
-
   # Prepare doublecmd-*.spec file
   cp -a rpm/doublecmd-*.spec $DC_TEMP_DIR
 

install/linux/update-repo-ppa.sh

@@ -5,7 +5,7 @@
 # Set Double Commander version
 DC_VER=0.8.0
 # Set Ubuntu series
-DISTRO=( trusty vivid wily )
+DISTRO=( wily xenial )
 
 # Temp directory
 DC_TEMP_DIR=/var/tmp/doublecmd-$(date +%y.%m.%d)
@@ -26,11 +26,6 @@ update_doublecmd()
   # Save revision number
   DC_REVISION=`$(pwd)/update-revision.sh ../../ $DC_SOURCE_DIR`
 
-  # Remove help files
-  rm -rf $DC_SOURCE_DIR/doc/en
-  rm -rf $DC_SOURCE_DIR/doc/ru
-  rm -rf $DC_SOURCE_DIR/doc/uk
-
   # Create doublecmd-x.x.x.orig.tar.gz
   pushd $DC_SOURCE_DIR/..
   tar -cvzf $DC_TEMP_DIR/doublecmd_$DC_VER.orig.tar.gz doublecmd-$DC_VER
@@ -68,11 +63,6 @@ update_doublecmd_svn()
   # Save revision number
   DC_REVISION=`$(pwd)/update-revision.sh ../../ $DC_SOURCE_DIR`
 
-  # Remove help files
-  rm -rf $DC_SOURCE_DIR/doc/en
-  rm -rf $DC_SOURCE_DIR/doc/ru
-  rm -rf $DC_SOURCE_DIR/doc/uk
-
   # Prepare debian directory
   mkdir -p $DC_SOURCE_DIR/debian
   cp -r $DC_SOURCE_DIR/install/linux/deb/doublecmd/* $DC_SOURCE_DIR/debian
@@ -105,11 +95,16 @@ update_doublecmd_svn()
 
 update_doublecmd_help()
 {
-  # Export from SVN
-  svn export ../../doc $DC_HELP_DIR
+  # Create output folder
+  mkdir -p $DC_HELP_DIR
 
-  # Remove text files
-  rm -f $DC_HELP_DIR/*.txt
+  # Save revision number
+  DC_REVISION=`$(pwd)/update-revision.sh ../../ $DC_SOURCE_DIR`
+
+  # Copy help files
+  cp -r ../../doc/en $DC_HELP_DIR/
+  cp -r ../../doc/ru $DC_HELP_DIR/
+  cp -r ../../doc/uk $DC_HELP_DIR/
 
   # Create doublecmd-help-x.x.x.orig.tar.gz
   pushd $DC_HELP_DIR/..

install/windows/install.bat

@@ -23,9 +23,9 @@ rem WFX plugins directories
 mkdir  %DC_INSTALL_DIR%\plugins\wfx
 mkdir  %DC_INSTALL_DIR%\plugins\wfx\ftp
 
+mkdir  %DC_INSTALL_DIR%\doc
 rem Copy directories
 xcopy /E language %DC_INSTALL_DIR%\language\
-xcopy /E doc\en   %DC_INSTALL_DIR%\doc\en\
 xcopy /E pixmaps  %DC_INSTALL_DIR%\pixmaps\
 rem Copy files
 copy doc\*.txt                      %DC_INSTALL_DIR%\doc\

src/platform/unix/ukeyfile.pas

@@ -145,6 +145,7 @@ begin
 end;
 
 function TKeyFile.ReadBool(const Section, Ident: String; Default: Boolean): Boolean;
+{$OPTIMIZATION OFF}
 var
   AError: PGError = nil;
 begin
@@ -155,6 +156,7 @@ begin
     g_error_free(AError);
   end;
 end;
+{$OPTIMIZATION DEFAULT}
 
 function TKeyFile.ReadString(const Section, Ident, Default: String): String;
 var

src/umaincommands.pas

@@ -2435,6 +2435,7 @@ begin
 end;
 
 procedure TMainCommands.cm_SwitchIgnoreList(const Params: array of string);
+{$OPTIMIZATION OFF}
 var
   WantedIgnoreList, BoolValue:boolean;
 begin
@@ -2463,6 +2464,7 @@ begin
     end;
   end;
 end;
+{$OPTIMIZATION DEFAULT}
 
 // Parameter is name of TOptionsEditorClass.
 procedure TMainCommands.cm_Options(const Params: array of string);
@@ -2621,6 +2623,7 @@ begin
 end;
 
 procedure TMainCommands.cm_ShowMainMenu(const Params: array of string);
+{$OPTIMIZATION OFF}
 var
   WantedMainMenu, BoolValue:boolean;
 begin
@@ -2644,6 +2647,7 @@ begin
     DoShowMainMenu(gMainMenu);
   end;
 end;
+{$OPTIMIZATION DEFAULT}
 
 procedure TMainCommands.cm_Refresh(const Params: array of string);
 begin