From b6d22db359831569c7c50a500390c27e5e662f54 Mon Sep 17 00:00:00 2001 From: Sameer Rahmani Date: Thu, 9 Jul 2015 14:07:08 +0430 Subject: [PATCH] disable function added to disable abilities --- fg42-config.el | 2 ++ lib/extensions/ruby/init.el | 4 ++-- lib/extensions/ruby/setup.el | 5 +---- lib/fg42/extension.el | 5 +++++ 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/fg42-config.el b/fg42-config.el index 12affe7..64c2505 100644 --- a/fg42-config.el +++ b/fg42-config.el @@ -7,4 +7,6 @@ 'web 'ruby) +(disable 'rbenv) +(describe-variable disabled-abilities) (fg42-initialize) diff --git a/lib/extensions/ruby/init.el b/lib/extensions/ruby/init.el index 8cb76a4..51761d2 100644 --- a/lib/extensions/ruby/init.el +++ b/lib/extensions/ruby/init.el @@ -9,7 +9,7 @@ (setup-inf-and-robe) (setup-bundler) - (with-ability 'rbenv + (with-ability rbenv (require 'rbenv) (global-rbenv-mode)) @@ -22,7 +22,7 @@ "Web development plugin initialization." (message "Initializing 'ruby' extension.") - (with-ability 'global-rbenv + (with-ability global-rbenv (require 'rbenv) (global-rbenv-mode)) diff --git a/lib/extensions/ruby/setup.el b/lib/extensions/ruby/setup.el index 5ecffe7..60c9f03 100644 --- a/lib/extensions/ruby/setup.el +++ b/lib/extensions/ruby/setup.el @@ -31,7 +31,7 @@ (setq irbpath (rbenv--expand-path "shims" "irb")) (setq irb (concat irbpath irbparams)) (add-to-list 'inf-ruby-implementations (cons "ruby" irb)) - (inf-ruby-minor-mode t) + (inf-ruby-minor-mode t)) ;;;###autoload @@ -60,7 +60,4 @@ ;; Hack autocomplete so it treat :symbole and symbole the same way (modify-syntax-entry ?: ".")) - - - (provide 'extensions/ruby/setup) diff --git a/lib/fg42/extension.el b/lib/fg42/extension.el index 1c08b43..e9fe791 100644 --- a/lib/fg42/extension.el +++ b/lib/fg42/extension.el @@ -24,6 +24,11 @@ "Return t if ability was not in disabled-abilities." (if (gethash name disabled-abilities) nil t)) +(defun disable (&rest abilities) + "Add the given abilities to disabled-abilities hash" + (dolist (abl abilities) + (puthash abl t disabled-abilities))) + ;; Macros --------------------------------- (defmacro ability (name deps &rest body) "Define an ability with the given name.