update org mode, do it in emacs

[buildscripts] / emacs

diff --git a/emacs b/emacs
index 5082b20e56dd75f4b71eb5543d93b2ba14dc3b5c..62cfc31c9f392f2b4d4a7f5ce40008d1cc0f1c58 100755 (executable)
--- a/emacs
+++ b/emacs
@@ -16,7 +16,7 @@
 set -eE -o pipefail
 trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?"' ERR
 
-set -x
+#set -x
 # arg = git commit to check out
 # -r = don't recompile from scratch
 # -u = update sources
@@ -27,15 +27,18 @@ recompile=true
 
 while [[ $1 == -* ]]; do
     case $1 in
-        -r) recompile=false; shift ;;
+        --no-r) recompile=false; shift ;;
         -u) update=true; shift ;;
         --) break ;;
     esac
 done
 
+e() { echo "$*"; "$@"; }
+
 export CFLAGS="-Og -g3"
 
-logq pi texlive hunspell git
+# gawk and attr were no longer automatically installed in stretch
+logq pi texlive hunspell git gawk attr
 case $(distro-name) in
     fedora )
         # before i learned the builddep command, i identified these
@@ -74,10 +77,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
@@ -86,12 +89,12 @@ if $recompile; then
 
     # git version
     if [[ $1 ]]; then
-        i clean -xxxfd
+        e i clean -xxxfd
     elif $update; then
-        i fetch
-        i clean -xxxffd
-        i reset --hard origin/master
-        i clean -xxxffd
+        e i fetch
+        e i clean -xxxffd
+        e i reset --hard origin/master
+        e i clean -xxxffd
     fi
 
     # autogen is usually only for the first build, assume it works
@@ -120,8 +123,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
-#~/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
+~/bin/buildscripts/org-mode
 
 if $update; then
     logq pi bzr