mirror of
https://github.com/ohmyzsh/ohmyzsh.git
synced 2024-11-18 03:40:08 +00:00
refactor(emacs): simplify emacsclient wrapper code
This commit is contained in:
parent
b37114b4d5
commit
27dcca5967
1 changed files with 17 additions and 19 deletions
|
@ -1,29 +1,27 @@
|
||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
|
|
||||||
_emacsfun()
|
emacsfun() {
|
||||||
{
|
local frames="$(emacsclient --alternate-editor "" -n -e "(length (frame-list))" 2>/dev/null)"
|
||||||
# get list of emacs frames.
|
|
||||||
frameslist=`emacsclient --alternate-editor '' --eval '(frame-list)' 2>/dev/null | egrep -o '(frame)+'`
|
|
||||||
|
|
||||||
if [ "$(echo "$frameslist" | sed -n '$=')" -ge 2 ] ;then
|
# Only create another X frame if there isn't one present
|
||||||
# prevent creating another X frame if there is at least one present.
|
if [ -z "$frames" -o "$frames" -lt 2 ]; then
|
||||||
emacsclient --alternate-editor "" "$@"
|
emacsclient --alternate-editor "" --create-frame "$@"
|
||||||
else
|
return $?
|
||||||
# Create one if there is no X window yet.
|
fi
|
||||||
emacsclient --alternate-editor "" --create-frame "$@"
|
|
||||||
fi
|
emacsclient --alternate-editor "" "$@"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
# adopted from https://github.com/davidshepherd7/emacs-read-stdin/blob/master/emacs-read-stdin.sh
|
# adopted from https://github.com/davidshepherd7/emacs-read-stdin/blob/master/emacs-read-stdin.sh
|
||||||
# If the second argument is - then write stdin to a tempfile and open the
|
# If the second argument is - then write stdin to a tempfile and open the
|
||||||
# tempfile. (first argument will be `--no-wait` passed in by the plugin.zsh)
|
# tempfile. (first argument will be `--no-wait` passed in by the plugin.zsh)
|
||||||
if [ "$#" -ge "2" -a "$2" = "-" ]
|
if [ $# -ge 2 -a "$2" = "-" ]; then
|
||||||
then
|
tempfile="$(mktemp --tmpdir emacs-stdin-$USERNAME.XXXXXXX 2>/dev/null \
|
||||||
tempfile="$(mktemp --tmpdir emacs-stdin-$USERNAME.XXXXXXX 2>/dev/null \
|
|| mktemp -t emacs-stdin-$USERNAME)" # support BSD mktemp
|
||||||
|| mktemp -t emacs-stdin-$USERNAME)" # support BSD mktemp
|
cat - > "$tempfile"
|
||||||
cat - > "$tempfile"
|
emacsfun --no-wait "$tempfile"
|
||||||
_emacsfun --no-wait $tempfile
|
return $?
|
||||||
else
|
|
||||||
_emacsfun "$@"
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
emacsfun "$@"
|
||||||
|
|
Loading…
Reference in a new issue