upstream/ohmyzsh
1
0
Fork 0
mirror of https://github.com/ohmyzsh/ohmyzsh.git synced 2024-09-21 00:05:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor(emacs): remove dependency on require_tool.sh and clean up code style

Browse Source
This commit is contained in:
Marc Cornellà 2021-09-27 18:08:12 +02:00
parent a42db12085
commit b37114b4d5
1 changed files with 44 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
plugins/emacs/emacs.plugin.zsh
View File

@ -9,25 +9,28 @@
# - You can share opened buffered across opened frames. # - You can share opened buffered across opened frames.
# - Configuration changes made at runtime are applied to all frames. # - Configuration changes made at runtime are applied to all frames.
# Require emacs version to be minimum 24
autoload -Uz is-at-least
is-at-least 24 "${${(Az)"$(emacsclient --version 2>/dev/null)"}[2]}" || return 0
if "$ZSH/tools/require_tool.sh" emacsclient 24 2>/dev/null ; then # Path to custom emacsclient launcher
export EMACS_PLUGIN_LAUNCHER="$ZSH/plugins/emacs/emacsclient.sh" export EMACS_PLUGIN_LAUNCHER="${0:A:h}/emacsclient.sh"
# set EDITOR if not already defined. # set EDITOR if not already defined.
export EDITOR="${EDITOR:-${EMACS_PLUGIN_LAUNCHER}}" export EDITOR="${EDITOR:-${EMACS_PLUGIN_LAUNCHER}}"
alias emacs="$EMACS_PLUGIN_LAUNCHER --no-wait" alias emacs="$EMACS_PLUGIN_LAUNCHER --no-wait"
alias e=emacs alias e=emacs
# open terminal emacsclient # open terminal emacsclient
alias te="$EMACS_PLUGIN_LAUNCHER -nw" alias te="$EMACS_PLUGIN_LAUNCHER -nw"
# same than M-x eval but from outside Emacs. # same than M-x eval but from outside Emacs.
alias eeval="$EMACS_PLUGIN_LAUNCHER --eval" alias eeval="$EMACS_PLUGIN_LAUNCHER --eval"
# create a new X frame # create a new X frame
alias eframe='emacsclient --alternate-editor "" --create-frame' alias eframe='emacsclient --alternate-editor "" --create-frame'
# Emacs ANSI Term tracking # Emacs ANSI Term tracking
if [[ -n "$INSIDE_EMACS" ]]; then if [[ -n "$INSIDE_EMACS" ]]; then
chpwd_emacs() { print -P "\033AnSiTc %d"; } chpwd_emacs() { print -P "\033AnSiTc %d"; }
print -P "\033AnSiTc %d" # Track current working directory print -P "\033AnSiTc %d" # Track current working directory
print -P "\033AnSiTu %n" # Track username print -P "\033AnSiTu %n" # Track username
@ -35,31 +38,26 @@ if "$ZSH/tools/require_tool.sh" emacsclient 24 2>/dev/null ; then
# add chpwd hook # add chpwd hook
autoload -Uz add-zsh-hook autoload -Uz add-zsh-hook
add-zsh-hook chpwd chpwd_emacs add-zsh-hook chpwd chpwd_emacs
fi
# Write to standard output the path to the file
# opened in the current buffer.
function efile {
local cmd="(buffer-file-name (window-buffer))"
"$EMACS_PLUGIN_LAUNCHER" --eval "$cmd" | tr -d \"
}
# Write to standard output the directory of the file
# opened in the the current buffer
function ecd {
local cmd="(let ((buf-name (buffer-file-name (window-buffer))))
(if buf-name (file-name-directory buf-name)))"
local dir="$($EMACS_PLUGIN_LAUNCHER --eval $cmd | tr -d \")"
if [ -n "$dir" ] ;then
echo "$dir"
else
echo "can not deduce current buffer filename." >/dev/stderr
return 1
fi
}
fi fi
## Local Variables: # Write to standard output the path to the file
## mode: sh # opened in the current buffer.
## End: function efile {
local cmd="(buffer-file-name (window-buffer))"
local file="$("$EMACS_PLUGIN_LAUNCHER" --eval "$cmd" | tr -d \")"
if [[ -z "$file" ]]; then
echo "Can't deduce current buffer filename." >&2
return 1
fi
echo "$file"
}
# Write to standard output the directory of the file
# opened in the the current buffer
function ecd {
local file
file="$(efile)" || return $?
echo "${file:h}"
}