diff options
| author | Luke Shumaker <lukeshu@sbcglobal.net> | 2015-01-29 01:27:46 -0500 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2015-01-29 01:27:46 -0500 |
| commit | b6695d61d479e5688f66077f79b2f44e44de4f59 (patch) | |
| tree | 9ccf830ff6a9928f5af6c92722a98a35e9add43f /.config/bash | |
| parent | 2a6dc16a75f4d7beed631d97a99b6a1fc82c4e79 (diff) | |
| parent | 6a5bd645c59b44ae87d09cf350b38e04fbf99d81 (diff) | |
Merge remote-tracking branch 'origin/build64-par' into gluglugt60-par
Conflicts:
.config/systemd/user/default.target.wants/emacs-daemon.service
Diffstat (limited to '.config/bash')
| -rw-r--r-- | .config/bash/rc.d/emacs.sh | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.config/bash/rc.d/emacs.sh b/.config/bash/rc.d/emacs.sh index 4a7b9b8..bb6454b 100644 --- a/.config/bash/rc.d/emacs.sh +++ b/.config/bash/rc.d/emacs.sh @@ -86,6 +86,7 @@ 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)))")") + [[ $DISPLAY != nil ]] || unset DISPLAY } ## Do those things ##################################################### |