diff --git a/core/core-project.el b/core/core-project.el index 861b815c1..b3f2681a7 100644 --- a/core/core-project.el +++ b/core/core-project.el @@ -34,7 +34,8 @@ (bind! :map (ido-common-completion-map ido-completion-map ido-file-completion-map) "C-n" 'ido-next-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) (add-hook! (ido-make-file-list ido-make-dir-list) 'narf*ido-sort-mtime) diff --git a/modules/lib/defuns-ruby.el b/modules/lib/defuns-ruby.el index 6b2496cba..819a99be3 100644 --- a/modules/lib/defuns-ruby.el +++ b/modules/lib/defuns-ruby.el @@ -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))