Remove vestiges of enh-ruby-mode; optimize narf|enable-robe-maybe

This commit is contained in:
Henrik Lissner 2015-08-14 07:38:51 -04:00
parent 90ef15e1c1
commit d9c86214b1
2 changed files with 4 additions and 5 deletions

View file

@ -4,9 +4,7 @@
(defun narf|enable-robe-maybe ()
(let ((file (buffer-file-name)))
;; Don't run in gemfiles, capfiles or vagrantfiles
(unless (or (string-equal (f-filename file) "Gemfile")
(string-equal (f-filename file) "Capfile")
(string-equal (f-filename file) "Vagrantfile")
(unless (or (member (f-filename file) '("Gemfile" "Capfile" "Vagrantfile"))
(f-ext? file "org")) ;; or org-mode
(robe-mode 1)
(narf|ruby-load-file file))))
@ -14,7 +12,7 @@
;;;###autoload
(defun narf|ruby-load-file (&optional file)
(let ((file (or file buffer-file-name)))
(when (and (eq major-mode 'enh-ruby-mode)
(when (and (eq major-mode 'ruby-mode)
(featurep 'robe)
(not (string= (f-base file) "Gemfile"))
(file-exists-p buffer-file-name))