Merge pull request #2651 from jehrhardt/fix-emacs

Fix Emacs plugin
2014-03-27 21:32:58 -07:00 · 2014-03-27 21:32:58 -07:00 · fe73f8d5b1
commit fe73f8d5b1
parent 175310ae27 c451ff4bf3
1 changed files with 1 additions and 1 deletions
--- 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