From 31fb8d02dcfd346723d76bec0c40787e7e45a9a4 Mon Sep 17 00:00:00 2001 From: Justin Hileman <justin@justinhileman.info> Date: Sun, 31 May 2015 08:30:48 -0700 Subject: [PATCH] [split] Move emacs plugin to oh-my-fish/plugin-emacs https://github.com/oh-my-fish/plugin-emacs --- plugins/emacs/README.md | 30 ----- plugins/emacs/emacs.load | 39 ------- plugins/emacs/functions/__kill_emacs.fish | 3 - plugins/emacs/functions/__launch_emacs.fish | 9 -- plugins/emacs/functions/e.fish | 3 - plugins/emacs/functions/ec.fish | 3 - plugins/emacs/functions/ecd.fish | 11 -- plugins/emacs/functions/eeval.fish | 3 - plugins/emacs/functions/efile.fish | 5 - plugins/emacs/functions/eframe.fish | 3 - plugins/emacs/functions/ek.fish | 3 - plugins/emacs/functions/emacs.fish | 3 - plugins/emacs/functions/emasc.fish | 3 - plugins/emacs/functions/emcas.fish | 3 - plugins/emacs/functions/et.fish | 3 - plugins/emacs/spec/emacs.spec.fish | 118 -------------------- 16 files changed, 242 deletions(-) delete mode 100644 plugins/emacs/README.md delete mode 100644 plugins/emacs/emacs.load delete mode 100644 plugins/emacs/functions/__kill_emacs.fish delete mode 100644 plugins/emacs/functions/__launch_emacs.fish delete mode 100644 plugins/emacs/functions/e.fish delete mode 100644 plugins/emacs/functions/ec.fish delete mode 100644 plugins/emacs/functions/ecd.fish delete mode 100644 plugins/emacs/functions/eeval.fish delete mode 100644 plugins/emacs/functions/efile.fish delete mode 100644 plugins/emacs/functions/eframe.fish delete mode 100644 plugins/emacs/functions/ek.fish delete mode 100644 plugins/emacs/functions/emacs.fish delete mode 100644 plugins/emacs/functions/emasc.fish delete mode 100644 plugins/emacs/functions/emcas.fish delete mode 100644 plugins/emacs/functions/et.fish delete mode 100644 plugins/emacs/spec/emacs.spec.fish diff --git a/plugins/emacs/README.md b/plugins/emacs/README.md deleted file mode 100644 index 302f400..0000000 --- a/plugins/emacs/README.md +++ /dev/null @@ -1,30 +0,0 @@ -# Emacs Plugin - -This plugin replicates the functionality of the [emacs](https://www.gnu.org/software/emacs/) plugin for [oh-my-zsh](http://ohmyz.sh/). -It is essentially a wrapper around the very useful [emacs daemon](http://www.emacswiki.org/emacs/EmacsAsDaemon) capability. - -Below is an extract from the original plugin source file: - -"Emacs 23 daemon capability is a killing feature. -One emacs process handles all your frames whether -you use a frame opened in a terminal via a ssh connection or X frames -opened on the same host. -Benefits are multiple - - * You don't have the cost of starting Emacs all the time anymore - * Opening a file is as fast as Emacs does not have anything else to do. - * You can share opened buffered across opened frames. - * Configuration changes made at runtime are applied to all frames." - - -### Usage - -To use this plugin add `emacs` to `fish_plugins` in you fish config file: - -```bash -set fish_plugins emacs -``` - -### Requirements - -Emacs 23 or later is required for this plugin. \ No newline at end of file diff --git a/plugins/emacs/emacs.load b/plugins/emacs/emacs.load deleted file mode 100644 index 41417ff..0000000 --- a/plugins/emacs/emacs.load +++ /dev/null @@ -1,39 +0,0 @@ -function __major_version - if test -n "$argv" - set -l full_metadata (eval $argv --version) - set -l full_version (echo $full_metadata | grep -o "[0-9]\+.[0-9]\+.[0-9]\+.[0-9]\+") - set -l major_version (echo $full_version | sed "s/\..*//") - end - - echo $major_version -end - -function __set_editor - if not set -q EDITOR - set -gx EDITOR emacs - end -end - -function __add_functions_to_path - set emacs_functions $fish_path/plugins/emacs/functions - set fish_function_path $emacs_functions $fish_function_path -end - -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 - __add_functions_to_path -end - -set -e emacs -set -e emacs_version -functions -e __major_version -functions -e __plugins_path -functions -e __set_editor -functions -e __add_functions_to_path diff --git a/plugins/emacs/functions/__kill_emacs.fish b/plugins/emacs/functions/__kill_emacs.fish deleted file mode 100644 index 4ee0364..0000000 --- a/plugins/emacs/functions/__kill_emacs.fish +++ /dev/null @@ -1,3 +0,0 @@ -function __kill_emacs - emacsclient --alternate-editor '' --eval '(kill-emacs)' 2>/dev/null -end diff --git a/plugins/emacs/functions/__launch_emacs.fish b/plugins/emacs/functions/__launch_emacs.fish deleted file mode 100644 index 1f23753..0000000 --- a/plugins/emacs/functions/__launch_emacs.fish +++ /dev/null @@ -1,9 +0,0 @@ -function __launch_emacs - set -l x (emacsclient --alternate-editor '' --eval '(x-display-list)' 2>/dev/null) - - if test -z "$x" -o "$x" = nil - emacsclient $argv --alternate-editor '' --create-frame - else - emacsclient $argv --alternate-editor '' - end -end diff --git a/plugins/emacs/functions/e.fish b/plugins/emacs/functions/e.fish deleted file mode 100644 index dacba24..0000000 --- a/plugins/emacs/functions/e.fish +++ /dev/null @@ -1,3 +0,0 @@ -function e - __launch_emacs $argv --no-wait -end diff --git a/plugins/emacs/functions/ec.fish b/plugins/emacs/functions/ec.fish deleted file mode 100644 index 1914e1b..0000000 --- a/plugins/emacs/functions/ec.fish +++ /dev/null @@ -1,3 +0,0 @@ -function ec - __launch_emacs $argv --create-frame --no-wait -end diff --git a/plugins/emacs/functions/ecd.fish b/plugins/emacs/functions/ecd.fish deleted file mode 100644 index b0b8978..0000000 --- a/plugins/emacs/functions/ecd.fish +++ /dev/null @@ -1,11 +0,0 @@ -function ecd - set -l cmd '(let ((buf-name (buffer-file-name (window-buffer)))) - (if buf-name (file-name-directory buf-name)))' - set -l dir (__launch_emacs --eval $cmd | tr -d '\"') - - if test -n "$dir" - echo $dir - else - echo 'cannot deduce current buffer filename.' >/dev/stderr - end -end diff --git a/plugins/emacs/functions/eeval.fish b/plugins/emacs/functions/eeval.fish deleted file mode 100644 index 1fd80b7..0000000 --- a/plugins/emacs/functions/eeval.fish +++ /dev/null @@ -1,3 +0,0 @@ -function eeval - __launch_emacs --eval $argv -end diff --git a/plugins/emacs/functions/efile.fish b/plugins/emacs/functions/efile.fish deleted file mode 100644 index 78ce2d0..0000000 --- a/plugins/emacs/functions/efile.fish +++ /dev/null @@ -1,5 +0,0 @@ -function efile - set -l cmd '(buffer-file-name (window-buffer))' - - __launch_emacs --eval $cmd | tr -d '\"' -end diff --git a/plugins/emacs/functions/eframe.fish b/plugins/emacs/functions/eframe.fish deleted file mode 100644 index d3ea82c..0000000 --- a/plugins/emacs/functions/eframe.fish +++ /dev/null @@ -1,3 +0,0 @@ -function eframe - __launch_emacs $argv --create-frame --no-wait -end diff --git a/plugins/emacs/functions/ek.fish b/plugins/emacs/functions/ek.fish deleted file mode 100644 index 03c9512..0000000 --- a/plugins/emacs/functions/ek.fish +++ /dev/null @@ -1,3 +0,0 @@ -function ek - __kill_emacs -end diff --git a/plugins/emacs/functions/emacs.fish b/plugins/emacs/functions/emacs.fish deleted file mode 100644 index 9419fe7..0000000 --- a/plugins/emacs/functions/emacs.fish +++ /dev/null @@ -1,3 +0,0 @@ -function emacs - __launch_emacs $argv --no-wait -end diff --git a/plugins/emacs/functions/emasc.fish b/plugins/emacs/functions/emasc.fish deleted file mode 100644 index c70d000..0000000 --- a/plugins/emacs/functions/emasc.fish +++ /dev/null @@ -1,3 +0,0 @@ -function emasc - __launch_emacs $argv --no-wait -end diff --git a/plugins/emacs/functions/emcas.fish b/plugins/emacs/functions/emcas.fish deleted file mode 100644 index 02b38bc..0000000 --- a/plugins/emacs/functions/emcas.fish +++ /dev/null @@ -1,3 +0,0 @@ -function emcas - __launch_emacs $argv --no-wait -end diff --git a/plugins/emacs/functions/et.fish b/plugins/emacs/functions/et.fish deleted file mode 100644 index 450a4f9..0000000 --- a/plugins/emacs/functions/et.fish +++ /dev/null @@ -1,3 +0,0 @@ -function et - __launch_emacs $argv --tty -end diff --git a/plugins/emacs/spec/emacs.spec.fish b/plugins/emacs/spec/emacs.spec.fish deleted file mode 100644 index dcea58b..0000000 --- a/plugins/emacs/spec/emacs.spec.fish +++ /dev/null @@ -1,118 +0,0 @@ -import plugins/fish-spec - - -function describe_emacs - - function before_all - set -g __emacs_current_editor $EDITOR - set -g __emacs_load_file $fish_path/plugins/emacs/emacs.load - set -g __emacs_functions e ec ek et ecd eeval efile eframe emacs emasc emcas - end - - function before_each - set -e EDITOR - set -g __emacs '/bin/emacs' - set -g __emacs_version 25 - end - - function it_sets_editor_on_load - load_emacs_plugin - - expect $EDITOR --to-equal "emacs" - end - - function it_does_not_set_editor_when_it_is_already_set - set EDITOR 'vim' - - load_emacs_plugin - - expect $EDITOR --to-equal "vim" - end - - function it_does_not_set_editor_when_emacs_is_not_found - emacs_is_not_found - - load_emacs_plugin - - expect "$EDITOR" --to-equal "" - end - - function it_does_not_set_editor_when_emacs_version_is_lower_than_23 - set __emacs_version 22 - - load_emacs_plugin - - expect "$EDITOR" --to-equal "" - end - - function it_adds_functions_to_fish_function_path - load_emacs_plugin - - expect (functions) --to-contain-all $__emacs_functions - end - - function it_has_a_test_helper_that_removes_emacs_functions - load_emacs_plugin - - expect (functions) --to-contain-all $__emacs_functions - - remove_emacs_functions - - expect (functions) --to-not-contain-all $__emacs_functions - end - - - function it_does_not_add_functions_when_emacs_is_not_found - remove_emacs_functions - emacs_is_not_found - - load_emacs_plugin - - expect (functions) --to-not-contain-all $__emacs_functions - end - - function it_does_not_add_functions_when_emacs_version_is_lower_than_23 - set __emacs_version 22 - - expect (functions) --to-not-contain-all $__emacs_functions - - load_emacs_plugin - - expect (functions) --to-not-contain-all $__emacs_functions - end - - - function emacs_is_not_found - set __emacs "" - set __emacs_version "" - end - - function load_emacs_plugin - source $__emacs_load_file - end - - function remove_emacs_functions - for path in $fish_function_path - set match (echo $path | grep emacs) - if test -z "$match" - set -g __new_fish_function_path $__new_fish_function_path $path - end - end - - set fish_function_path $__new_fish_function_path - set -e __new_fish_function_path - end - - function after_all - set EDITOR $__emacs_current_editor - - set -e __emacs - set -e __emacs_version - set -e __emacs_load_file - set -e __emacs_functions - set -e __emacs_current_editor - end -end - - -spec.run $argv -- GitLab