Merge branch 'master' into vscode

.kdiff3rc

@@ -93,11 +93,12 @@ WindowStateMaximised=true
 WordWrap=false
 
 [MainWindow]
+Height 1080=1081
 Height 768=769
 Height 900=901
 Height 975=976
 Height 985=986
-State=AAAA/wAAAAD9AAAAAAAAB4AAAANTAAAABAAAAAQAAAAIAAAACPwAAAABAAAAAgAAAAEAAAAWAG0AYQBpAG4AVABvAG8AbABCAGEAcgEAAAAA/////wAAAAAAAAAA
+State=AAAA/wAAAAD9AAAAAAAAB4AAAAO8AAAABAAAAAQAAAAIAAAACPwAAAABAAAAAgAAAAEAAAAWAG0AYQBpAG4AVABvAG8AbABCAGEAcgEAAAAA/////wAAAAAAAAAA
 ToolBarsMovable=Disabled
 Width 1366=1367
 Width 1440=1441

.travis.yml

@@ -6,7 +6,7 @@ script:
 
 env:
     - DETECTED_OS=fedora:24
-    - DETECTED_OS=debian:jessie
+    - DETECTED_OS=debian:jessie NOUPGRADE=true
     - DETECTED_OS=ubuntu:trusty
     - DETECTED_OS=ubuntu:xenial
 

common/configure_fresh_system

@@ -112,7 +112,12 @@ if [[ -z $NOVIM ]]; then
     echo "\n" | vim +PluginInstall +qa
     if [[ -z $NOYCM ]]; then
         cd ~/.vim/bundle/YouCompleteMe
-        ./install.py --clang-completer --racer-completer --tern-completer
+
+        if [[ -z $NOPYTHON3 ]]; then
+            python3 ./install.py --clang-completer --racer-completer --tern-completer
+        else
+            python ./install.py --clang-completer --racer-completer --tern-completer
+        fi
     fi
 fi
 

debian/configure_fresh_system

@@ -3,7 +3,11 @@
 set -e
 
 sudo apt-get update
-sudo apt-get -y upgrade
+
+if [[ -z $NOUPGRADE ]]; then
+    sudo apt-get -y upgrade
+fi
+
 install_packages="sudo apt-get -y --fix-missing install aptitude meld whois zsh tmux atop aria2 curl pv gajim tor torsocks nodejs icedove icedove-enigmail icedove-sogo-connector gajim lm-sensors freecad python3-pip meld whois curl pv tor torsocks nodejs npm terminator gsmartcontrol python-pip mercurial redshift gtk-redshift cmake intltool gparted wine solaar glances silversearcher-ag dkms linux-kernel-headers golang keepass2 libncurses5-dev libgnome2-dev libgnomeui-dev libgtk2.0-dev libatk1.0-dev libbonoboui2-dev libcairo2-dev libx11-dev libxpm-dev libxt-dev python-dev ruby-dev git retext kdiff3"
 
 set +e

fedora/configure_fresh_system

@@ -4,7 +4,7 @@ set -e
 
 #software and shell
 sudo dnf -y upgrade --best --allowerasing
-sudo dnf -y --best --allowerasing install vim tmux atop zsh thunderbird thunderbird-enigmail thunderbird-lightning firefox aria2 gajim lm_sensors freecad python3-pip qt5-qtbase-devel qt5-qtwebkit-devel meld whois curl pv nodejs npm terminator gsmartcontrol python-pip mercurial python-devel libxslt-devel libjpeg-turbo-devel conky conky-manager redshift redshift-gtk cmake gtk2-devel intltool gparted wine solaar glances the_silver_searcher dkms kernel-devel gimp transmission-gtk git xz util-linux-user powertop dnf-automatic kdiff3 yum-utils util-linux-user
+sudo dnf -y --best --allowerasing install tmux atop zsh thunderbird thunderbird-enigmail thunderbird-lightning firefox aria2 gajim lm_sensors freecad python3-pip qt5-qtbase-devel qt5-qtwebkit-devel meld whois curl pv nodejs npm terminator gsmartcontrol python-pip mercurial python3-devel libxslt-devel libjpeg-turbo-devel conky conky-manager redshift redshift-gtk cmake gtk2-devel intltool gparted wine solaar glances the_silver_searcher dkms kernel-devel gimp transmission-gtk git xz util-linux-user powertop dnf-automatic kdiff3 yum-utils util-linux-user ncurses-devel
 FEDORA_VERSION=`rpm -E %fedora`
 sudo dnf -y install http://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-$FEDORA_VERSION.noarch.rpm
 sudo dnf -y install http://download1.rpmfusion.org/nonfree/fedora/rpmfusion-nonfree-release-$FEDORA_VERSION.noarch.rpm
@@ -25,6 +25,22 @@ if [[ -z $NO_SYSTEMCTL ]]; then
     sudo systemctl list-timers "*dnf-*"
 fi
 
+VIM_BUILD_DIR=/tmp
+cd "$VIM_BUILD_DIR"
+git clone https://github.com/vim/vim.git
+cd vim
+./configure --with-features=huge \
+            --enable-multibyte \
+            --enable-rubyinterp \
+            --enable-python3interp=yes \
+            --enable-luainterp \
+            --enable-gui=no \
+            --enable-cscope 
+make -j2
+sudo make install
+cd
+rm -fvr "$VIM_BUILD_DIR/vim"
+
 DIR="$DIR/../"
 DIR="$DIR" $DIR/common/configure_fresh_system
 

ubuntu/trusty/configure_fresh_system

@@ -29,4 +29,5 @@ sudo apt-get -y install mono-devel mono-complete
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 DIR="$DIR/../../"
 export NO_GO=true
+export NOPYTHON3=true
 DIR="$DIR" $DIR/common/configure_fresh_system