summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog2
-rw-r--r--emacs.eselect3
2 files changed, 4 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 14aeecf..32aaec3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -54,3 +54,5 @@ Version 0.5 (24 Mar 2007)
env.eselect seems to be buggy; use env-update instead.
Redundant remove_symlinks removed.
Version 0.6 (28 Mar 2007)
+ 28 Mar 2007
+ Undo previous change.
diff --git a/emacs.eselect b/emacs.eselect
index 544bba7..3f6d7af 100644
--- a/emacs.eselect
+++ b/emacs.eselect
@@ -184,7 +184,7 @@ do_set() {
[[ -w "${ROOT}/usr/bin" ]] || die -q "You need to be root!"
if [[ -L "${ROOT}/usr/bin/emacs" ]]; then
- true
+ remove_symlinks || die -q "Couldn't remove existing symlink"
elif [[ -e "${ROOT}/usr/bin/emacs" ]]; then
die -q "Sorry, ${ROOT}/usr/bin/emacs confuses me"
fi
@@ -210,6 +210,7 @@ do_update() {
if [[ -L "${ROOT}/usr/bin/emacs" ]]; then
[[ ${1} == "--if-unset" \
&& -e "$(canonicalise ${ROOT}/usr/bin/emacs)" ]] && return
+ remove_symlinks || die -q "Couldn't remove existing symlink"
elif [[ -e "${ROOT}/usr/bin/emacs" ]]; then
die -q "Sorry, ${ROOT}/usr/bin/emacs confuses me"
fi