diff options
| author | Robby Russell <robby@planetargon.com> | 2014-03-27 21:32:58 -0700 |
|---|---|---|
| committer | Robby Russell <robby@planetargon.com> | 2014-03-27 21:32:58 -0700 |
| commit | fe73f8d5b177e0bf330ef296994e8772e3da913f (patch) | |
| tree | 8196a15fd6467cb91ca8fc4dcb8908ca3e539bf9 | |
| parent | 175310ae271364ceb5289a14284b1787677abc33 (diff) | |
| parent | c451ff4bf317188da20bfe18021a93640d54133b (diff) | |
| download | zsh-fe73f8d5b177e0bf330ef296994e8772e3da913f.tar.gz zsh-fe73f8d5b177e0bf330ef296994e8772e3da913f.tar.bz2 zsh-fe73f8d5b177e0bf330ef296994e8772e3da913f.zip | |
Merge pull request #2651 from jehrhardt/fix-emacs
Fix Emacs plugin
| -rwxr-xr-x | plugins/emacs/emacsclient.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/plugins/emacs/emacsclient.sh b/plugins/emacs/emacsclient.sh index 38d419813..625201a16 100755 --- a/plugins/emacs/emacsclient.sh +++ b/plugins/emacs/emacsclient.sh @@ -3,7 +3,7 @@ # get list of available X windows. x=`emacsclient --alternate-editor '' --eval '(x-display-list)' 2>/dev/null` -if [ -z "$x" ] ;then +if [ -z "$x" ] || [ "$x" = "nil" ] ;then # Create one if there is no X window yet. emacsclient --alternate-editor "" --create-frame "$@" else |