Commit 08da19e3 authored by akinnane's avatar akinnane Committed by Marc Cornellà
Browse files

emacs: revert cab1ac6e (#7765)

Revert cab1ac6e

The change from the above commit breaks opening a new emacs frame if
there isn't a existing frame open.

When emacs is running in daemon mode, there will always be a frame
associated with the daemon, even if there are no visible frames.

The lisp function `frame-list`, will always return 1 frame.
```
emacsclient --eval '(frame-list)'
(#<frame F1 0xa3c680>)
```

When an real frame is open, two frames are reported by the `frame-list`
function.
```
emacsclient --eval '(frame-list)'
(#<frame F1 0xa3c680> #<frame emacs Prelude - ~/oh-my-zsh/plugins/emacs/emacsclient.sh 0xf50e10>)
```

See:
https://emacs.stackexchange.com/questions/44537/extra-frame-in-visible-frame-list-when-started-in-daemon-mode-is-causing-prob
https://emacs.stackexchange.com/questions/18859/dont-let-the-daemon-frame-make-a-file-visible
parent b57c0ac6
......@@ -5,7 +5,7 @@ _emacsfun()
# get list of emacs frames.
frameslist=`emacsclient --alternate-editor '' --eval '(frame-list)' 2>/dev/null | egrep -o '(frame)+'`
if [ "$(echo "$frameslist" | sed -n '$=')" -ge 1 ] ;then
if [ "$(echo "$frameslist" | sed -n '$=')" -ge 2 ] ;then
# prevent creating another X frame if there is at least one present.
emacsclient --alternate-editor "" "$@"
else
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment