iankelling.org
/
git
/
buildscripts
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
96fd42e
)
update org mode, do it in emacs
author
Ian Kelling
<ian@iankelling.org>
Sun, 15 Jan 2017 15:32:37 +0000
(07:32 -0800)
committer
Ian Kelling
<ian@iankelling.org>
Sun, 15 Jan 2017 15:32:37 +0000
(07:32 -0800)
emacs
patch
|
blob
|
history
org-mode
patch
|
blob
|
history
diff --git
a/emacs
b/emacs
index a91b708f22f373b0175523b22787987848641eb5..62cfc31c9f392f2b4d4a7f5ce40008d1cc0f1c58 100755
(executable)
--- a/
emacs
+++ b/
emacs
@@
-33,7
+33,7
@@
while [[ $1 == -* ]]; do
esac
done
esac
done
-e() { echo "$
@
"; "$@"; }
+e() { echo "$
*
"; "$@"; }
export CFLAGS="-Og -g3"
export CFLAGS="-Og -g3"
@@
-77,10
+77,10
@@
esac
dir=/a/opt/emacs-`distro-name``debian-archive`
if [[ ! -e $dir ]]; then
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
recompile=true
fi
-cd $dir
+
e
cd $dir
if $recompile; then
# todo, consider when this should be uncommented
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
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
if $update; then
logq pi bzr
diff --git
a/org-mode
b/org-mode
index 0474aa957a8ce1751dcaac6f22e42f4af7c75d95..701a5d16ace0e9ac024c51a3212f07316e1593a8 100755
(executable)
--- a/
org-mode
+++ b/
org-mode
@@
-28,8
+28,8
@@
if isdeb; then
else
logq pi texinfo-tex
fi
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
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
# 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
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
logq make install