various fixes

[buildscripts] / emacs

diff --git a/emacs b/emacs
index a91b708f22f373b0175523b22787987848641eb5..9366f4153b3171d43721182a9915ec0534414c01 100755 (executable)
--- a/emacs
+++ b/emacs
@@ -33,12 +33,19 @@ while [[ $1 == -* ]]; do
     esac
 done
 
-e() { echo "$@"; "$@"; }
+e() { echo "$*"; "$@"; }
 
 export CFLAGS="-Og -g3"
 
 # gawk and attr were no longer automatically installed in stretch
-logq pi texlive hunspell git gawk attr
+extras=
+if isdebian-testing; then
+    # while this bug exists
+    # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=853970
+    # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=852611
+    extras=texlive-base/unstable
+fi
+logq pi texlive hunspell git gawk attr $extras
 case $(distro-name) in
     fedora )
         # before i learned the builddep command, i identified these
@@ -77,10 +84,10 @@ esac
 dir=/a/opt/emacs-`distro-name``debian-archive`
 
 if [[ ! -e $dir ]]; then
-    cp -r /a/opt/emacs $dir
+    e cp -r /a/opt/emacs $dir
     recompile=true
 fi
-cd $dir
+e cd $dir
 
 if $recompile; then
     # todo, consider when this should be uncommented
@@ -123,8 +130,9 @@ s lnf /usr/local/bin/emacs /usr/bin
 
 logq emacs --batch -l ~/.emacs.d/init.el -l ~/.emacs.d/compile-init-dir.el
 
-# not keeping up with the latest org-mode development anymore
-#~/bin/buildscripts/org-mode
+# as of 01-2017, built-in org mode has a bug that
+# org-edit-src-exit does not get bound, so using latest
+/a/bin/buildscripts/org-mode
 
 if $update; then
     logq pi bzr