mirror of
https://github.com/ohmyzsh/ohmyzsh.git
synced 2024-11-18 11:50:07 +00:00
fix(emacs): assess if there are open frames of the expected type
This change looks at the frame type of the open frames ('framep) and looks if they're of the type requested based on the arguments passed to emacsclient (-nw/-t/--tty require tty frames, otherwise we need graphical frames). NOTE: this code considers anything different than t as graphical terminals, including MS-DOS types (pc). I don't have such a setup to test if this is correct.
This commit is contained in:
parent
27dcca5967
commit
2acae3797b
1 changed files with 12 additions and 2 deletions
|
@ -1,10 +1,20 @@
|
||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
|
|
||||||
emacsfun() {
|
emacsfun() {
|
||||||
local frames="$(emacsclient --alternate-editor "" -n -e "(length (frame-list))" 2>/dev/null)"
|
local cmd frames
|
||||||
|
|
||||||
|
# Build the Emacs Lisp command to check for suitable frames
|
||||||
|
# See https://www.gnu.org/software/emacs/manual/html_node/elisp/Frames.html#index-framep
|
||||||
|
case "$*" in
|
||||||
|
*-t*|*--tty*|*-nw*) cmd="(memq 't (mapcar 'framep (frame-list)))" ;; # if != nil, there are tty frames
|
||||||
|
*) cmd="(delete 't (mapcar 'framep (frame-list)))" ;; # if != nil, there are graphical terminals (x, w32, ns)
|
||||||
|
esac
|
||||||
|
|
||||||
|
# Check if there are suitable frames
|
||||||
|
frames="$(emacsclient -a '' -n -e "$cmd" 2>/dev/null)"
|
||||||
|
|
||||||
# Only create another X frame if there isn't one present
|
# Only create another X frame if there isn't one present
|
||||||
if [ -z "$frames" -o "$frames" -lt 2 ]; then
|
if [ -z "$frames" -o "$frames" = nil ]; then
|
||||||
emacsclient --alternate-editor "" --create-frame "$@"
|
emacsclient --alternate-editor "" --create-frame "$@"
|
||||||
return $?
|
return $?
|
||||||
fi
|
fi
|
||||||
|
|
Loading…
Reference in a new issue