summaryrefslogtreecommitdiff
path: root/.config/bash/rc.d/emacs.sh
diff options
context:
space:
mode:
authorLuke Shumaker <LukeShu@sbcglobal.net>2014-04-27 17:13:55 -0400
committerLuke Shumaker <LukeShu@sbcglobal.net>2014-04-27 17:13:55 -0400
commitb64b7f39f869c3ea20e66bf82617b6e4cc26ff44 (patch)
tree4e553f3a32207fc6cac351942be3ecd70dbae183 /.config/bash/rc.d/emacs.sh
parent0ebb378e5337437f9ddf09598741bdc39a5ca6ee (diff)
misc
Diffstat (limited to '.config/bash/rc.d/emacs.sh')
-rw-r--r--.config/bash/rc.d/emacs.sh4
1 files changed, 3 insertions, 1 deletions
diff --git a/.config/bash/rc.d/emacs.sh b/.config/bash/rc.d/emacs.sh
index 165d71e..fe9d7bf 100644
--- a/.config/bash/rc.d/emacs.sh
+++ b/.config/bash/rc.d/emacs.sh
@@ -84,7 +84,9 @@ if [[ $TERM == eterm* ]]; then
}
# Set the shell's X11 display (emacs -> shell)
_emacs_set_shell_DISPLAY() {
- export DISPLAY=$(_emacs_unquote "$(_emacs_run "(cdr (assoc 'display (frame-parameters)))")")
+ if [[ -n $EMACS ]]; then
+ export DISPLAY=$(_emacs_unquote "$(_emacs_run "(cdr (assoc 'display (frame-parameters)))")")
+ fi
}
## Do those things #####################################################