colonelpanic/dotfiles
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix GIT_EDITOR in linux.

Browse Source
This commit is contained in:
Ivan Malison 2014-12-10 14:36:23 -08:00
parent ed708fc875
commit f2ceb771e5
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
dotfiles/lib/shellenv/emacs.sh
View File

@ -57,7 +57,9 @@ function focus_emacs {
} }
function emacs_get_running_instances { function emacs_get_running_instances {
pgrep -i emacs | xargs ps -o command -p | egrep -o " --daemon=(.*)" | awk -F= '{print $2}' | sed 's/\^J3,4\^J//' local command='pgrep'
is_osx && command='pgrep -i'
$command emacs | xargs ps -o command -p | egrep -o " --daemon=(.*)" | awk -F= '{print $2}' | sed 's/\^J3,4\^J//'
} }
function emacs_open { function emacs_open {
@ -66,9 +68,8 @@ function emacs_open {
fi fi
local server_file="$(emacs_get_running_instances | head -n1)" local server_file="$(emacs_get_running_instances | head -n1)"
emacs_make_frame_if_none_exists $server_file emacs_make_frame_if_none_exists $server_file
echo "$server_file"
[ ! -z "$*" ] && emacsclient "$@" --server-file="$server_file" [ ! -z "$*" ] && emacsclient "$@" --server-file="$server_file"
focus_emacs is_osx && focus_emacs
} }
function time_emacs { function time_emacs {
@ -79,4 +80,4 @@ function time_emacs {
export EDITOR='emacs_open' export EDITOR='emacs_open'
export VISUAL="$EDITOR" export VISUAL="$EDITOR"
# This is ugly as sin but I can't figure out how else to do it. # This is ugly as sin but I can't figure out how else to do it.
export GIT_EDITOR="zsh -c 'source ~/.zshrc && emacs_open '"'"$@"' export GIT_EDITOR="zsh -c 'emacs_open '"'"$@"; return 0'