github-mirror/oh-my-fish
2
0
Fork 0
mirror of https://github.com/oh-my-fish/oh-my-fish.git synced 2025-02-17 10:52:47 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add emacs plugin (even more updated)

Browse Source 
Incorporate changes after code review of #408
This commit is contained in:
Kelvin Smith 2015-03-31 21:57:26 +05:30
parent 55a2e6d003
commit c501d0f2c6
3 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
plugins/emacs/emacs.load
View File

@ -9,7 +9,9 @@ function __major_version
end
function __set_editor
set -q EDITOR; or set -gx EDITOR emacs
if not set -q EDITOR
set -gx EDITOR emacs
end
end
function __add_functions_to_path
@ -17,8 +19,12 @@ function __add_functions_to_path
set fish_function_path $emacs_functions $fish_function_path
end
set -q __emacs; or set __emacs (which emacs)
set -q __emacs_version; or set __emacs_version (__major_version $__emacs)
if not set -q __emacs
set __emacs (which emacs)
end
if not set -q __emacs_version
set __emacs_version (__major_version $__emacs)
end
if test "$__emacs_version" -gt 23
__set_editor

4
plugins/emacs/functions/__launch_emacs.fish
View File

@ -1,9 +1,9 @@
function __launch_emacs
set -l x (emacsclient --alternate-editor '' --eval '(x-display-list)' 2>/dev/null)
if begin; test -z "$x"; or test $x = nil; end
if test -z "$x" -o "$x" = nil
emacsclient $argv --alternate-editor '' --create-frame
else
or emacsclient $argv --alternate-editor ''
emacsclient $argv --alternate-editor ''
end
end

1
plugins/emacs/functions/ecd.fish
View File

@ -7,6 +7,5 @@ function ecd
echo $dir
else
echo 'cannot deduce current buffer filename.' >/dev/stderr
return 1
end
end