emenel/doomemacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

3
core/core-project.el
View file

@ -34,7 +34,8 @@
(bind! :map (ido-common-completion-map ido-completion-map ido-file-completion-map) (bind! :map (ido-common-completion-map ido-completion-map ido-file-completion-map)
"C-n" 'ido-next-match "C-n" 'ido-next-match
"C-p" 'ido-prev-match "C-p" 'ido-prev-match
"C-w" 'ido-delete-backward-word-updir)) "C-w" 'ido-delete-backward-word-updir
"C-u" 'ido-up-directory))
(advice-add 'ido-sort-mtime :override 'narf*ido-sort-mtime) (advice-add 'ido-sort-mtime :override 'narf*ido-sort-mtime)
(add-hook! (ido-make-file-list ido-make-dir-list) 'narf*ido-sort-mtime) (add-hook! (ido-make-file-list ido-make-dir-list) 'narf*ido-sort-mtime)

6
modules/lib/defuns-ruby.el
View file

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