From 7f9d0ee2aef54df823a9d8ece620e3a1882a03ae Mon Sep 17 00:00:00 2001 From: Ian Kelling Date: Sun, 15 Jan 2017 07:32:37 -0800 Subject: [PATCH] update org mode, do it in emacs --- emacs | 11 ++++++----- org-mode | 14 ++++++++++---- 2 files changed, 16 insertions(+), 9 deletions(-) diff --git a/emacs b/emacs index a91b708..62cfc31 100755 --- a/emacs +++ b/emacs @@ -33,7 +33,7 @@ while [[ $1 == -* ]]; do esac done -e() { echo "$@"; "$@"; } +e() { echo "$*"; "$@"; } export CFLAGS="-Og -g3" @@ -77,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 @@ -123,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 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 +~/bin/buildscripts/org-mode if $update; then logq pi bzr diff --git a/org-mode b/org-mode index 0474aa9..701a5d1 100755 --- a/org-mode +++ b/org-mode @@ -28,8 +28,8 @@ if isdeb; then else logq pi texinfo-tex fi -rm -rf !(.git) -i checkout -f errbuff +# rm -rf !(.git) +# i checkout -f errbuff if [[ $1 == -u ]]; then git fetch @@ -40,8 +40,14 @@ fi # org-learn is a dependency of org-drill dd of=local.mk <<'EOF' ORG_ADD_CONTRIB = org-drill org-learn -EMACS = /usr/bin/emacs +EMACS = /usr/local/bin/emacs prefix = /a/c/.emacs.d EOF -rm -rf /a/c/.emacs.d/emacs + +d=/a/c/.emacs.d/emacs +if [[ -e $d ]]; then + d2=${d}-disabled + rm -rf $d2 + mv $d $d2 +fi logq make install -- 2.30.2