linux/ohmyzsh
1
0
Fork 0
mirror of https://github.com/ohmyzsh/ohmyzsh.git synced 2024-11-26 21:51:05 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

refactor(emacs): simplify emacsclient wrapper code

Browse source
This commit is contained in:
Marc Cornellà 2021-09-28 10:10:43 +02:00
parent b37114b4d5
commit 27dcca5967
1 changed files with 17 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
plugins/emacs/emacsclient.sh
View file

@ -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 "" "$@"
else
# Create one if there is no X window yet.
emacsclient --alternate-editor "" --create-frame "$@" emacsclient --alternate-editor "" --create-frame "$@"
return $?
fi 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"
else return $?
_emacsfun "$@"
fi fi
emacsfun "$@"