summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Shumaker <luke@build-u904-AMD64.(none)>2011-05-13 11:05:26 -0400
committerLuke Shumaker <luke@build-u904-AMD64.(none)>2011-05-13 11:05:26 -0400
commit43f45210630f6491b52af46bc7e85693a3961709 (patch)
tree65f0f5482f677d4cc0fa7075e13f45f596c9b5c6
parent8f31af55544adbf7530f1581a828856a68c8d1b6 (diff)
Make it so that editor can be called without a filename or other argument
-rw-r--r--.bash.d/emacs.sh3
-rw-r--r--.profile1
-rw-r--r--.selected_editor1
-rwxr-xr-xbin/v-editor4
4 files changed, 4 insertions, 5 deletions
diff --git a/.bash.d/emacs.sh b/.bash.d/emacs.sh
index b3c5c53..66b5558 100644
--- a/.bash.d/emacs.sh
+++ b/.bash.d/emacs.sh
@@ -1,8 +1,5 @@
case "$SELECTED_EDITOR" in
emacsclient*)
- if [ -n "$DISPLAY" ]; then
- export VISUAL="$SELECTED_EDITOR -c"
- fi
case "$TERM" in
eterm*)
SELECTED_EDITOR="$SELECTED_EDITOR -n"
diff --git a/.profile b/.profile
index 8808917..07fa59a 100644
--- a/.profile
+++ b/.profile
@@ -25,6 +25,7 @@ fi
if [ -f "$HOME/.selected_editor" ]; then
. "$HOME/.selected_editor"
export SELECTED_EDITOR
+ export ALTERNATE_EDITOR
export EDITOR="${EDITOR:-$SELECTED_EDITOR}"
export VISUAL="${VISUAL:-$SELECTED_EDITOR}"
fi
diff --git a/.selected_editor b/.selected_editor
index 095d9cf..1bb91d9 100644
--- a/.selected_editor
+++ b/.selected_editor
@@ -1,2 +1,3 @@
# Generated by /usr/bin/select-editor
SELECTED_EDITOR="emacsclient -a ''"
+ALTERNATE_EDITOR="$SELECTED_EDITOR -c" \ No newline at end of file
diff --git a/bin/v-editor b/bin/v-editor
index dc141bc..86d1f50 100755
--- a/bin/v-editor
+++ b/bin/v-editor
@@ -1,7 +1,7 @@
#!/bin/sh
-if [ -n "$DISPLAY" ]; then
+(if [ -n "$DISPLAY" ]; then
${VISUAL:-$SELECTED_EDITOR} $@
else
${EDITOR:-$SELECTED_EDITOR} $@
-fi
+fi) || ${ALTERNATE_EDITOR:-false} $@ \ No newline at end of file