From 4b9386b55569bb4d5a4e275206f7e068cd8df8a0 Mon Sep 17 00:00:00 2001 From: Bozhidar Batsov Date: Tue, 11 Oct 2011 00:38:10 +0300 Subject: [PATCH] cleanup & small fixes --- init.el | 3 ++- prelude-c.el => modules/prelude-c.el | 0 prelude-clojure.el => modules/prelude-clojure.el | 0 prelude-coffee.el => modules/prelude-coffee.el | 0 prelude-common-lisp.el => modules/prelude-common-lisp.el | 0 prelude-core.el => modules/prelude-core.el | 4 ++-- prelude-editor.el => modules/prelude-editor.el | 0 prelude-emacs-lisp.el => modules/prelude-emacs-lisp.el | 0 .../prelude-global-keybindings.el | 2 -- prelude-haskell.el => modules/prelude-haskell.el | 0 prelude-latex.el => modules/prelude-latex.el | 0 prelude-lisp.el => modules/prelude-lisp.el | 0 prelude-markdown.el => modules/prelude-markdown.el | 0 prelude-packages.el => modules/prelude-packages.el | 2 +- prelude-perl.el => modules/prelude-perl.el | 0 prelude-ruby.el => modules/prelude-ruby.el | 0 prelude-ui.el => modules/prelude-ui.el | 0 prelude-xml.el => modules/prelude-xml.el | 0 18 files changed, 5 insertions(+), 6 deletions(-) rename prelude-c.el => modules/prelude-c.el (100%) rename prelude-clojure.el => modules/prelude-clojure.el (100%) rename prelude-coffee.el => modules/prelude-coffee.el (100%) rename prelude-common-lisp.el => modules/prelude-common-lisp.el (100%) rename prelude-core.el => modules/prelude-core.el (99%) rename prelude-editor.el => modules/prelude-editor.el (100%) rename prelude-emacs-lisp.el => modules/prelude-emacs-lisp.el (100%) rename prelude-global-keybindings.el => modules/prelude-global-keybindings.el (97%) rename prelude-haskell.el => modules/prelude-haskell.el (100%) rename prelude-latex.el => modules/prelude-latex.el (100%) rename prelude-lisp.el => modules/prelude-lisp.el (100%) rename prelude-markdown.el => modules/prelude-markdown.el (100%) rename prelude-packages.el => modules/prelude-packages.el (97%) rename prelude-perl.el => modules/prelude-perl.el (100%) rename prelude-ruby.el => modules/prelude-ruby.el (100%) rename prelude-ui.el => modules/prelude-ui.el (100%) rename prelude-xml.el => modules/prelude-xml.el (100%) diff --git a/init.el b/init.el index ba784ae..64b6b3c 100644 --- a/init.el +++ b/init.el @@ -39,10 +39,11 @@ (push "/usr/local/bin" exec-path)) (defvar prelude-dir "~/.emacs.d/") - +(defvar modules-dir (concat prelude-dir "modules/")) (defvar vendor-dir (concat prelude-dir "vendor/")) (add-to-list 'load-path prelude-dir) +(add-to-list 'load-path modules-dir) (add-to-list 'load-path vendor-dir) (require 'prelude-ui) diff --git a/prelude-c.el b/modules/prelude-c.el similarity index 100% rename from prelude-c.el rename to modules/prelude-c.el diff --git a/prelude-clojure.el b/modules/prelude-clojure.el similarity index 100% rename from prelude-clojure.el rename to modules/prelude-clojure.el diff --git a/prelude-coffee.el b/modules/prelude-coffee.el similarity index 100% rename from prelude-coffee.el rename to modules/prelude-coffee.el diff --git a/prelude-common-lisp.el b/modules/prelude-common-lisp.el similarity index 100% rename from prelude-common-lisp.el rename to modules/prelude-common-lisp.el diff --git a/prelude-core.el b/modules/prelude-core.el similarity index 99% rename from prelude-core.el rename to modules/prelude-core.el index fcf6a88..7d1c57f 100644 --- a/prelude-core.el +++ b/modules/prelude-core.el @@ -260,7 +260,7 @@ there's a region, all lines that region covers will be duplicated." (while (progn (imenu--cleanup) (setq imenu--index-alist nil) - (ido-goto-symbol (imenu--make-index-alist)) + (prelude-ido-goto-symbol (imenu--make-index-alist)) (setq selected-symbol (ido-completing-read "Symbol? " symbol-names)) (string= (car imenu--rescan-item) selected-symbol))) @@ -277,7 +277,7 @@ there's a region, all lines that region covers will be duplicated." (let (name position) (cond ((and (listp symbol) (imenu--subalist-p symbol)) - (ido-goto-symbol symbol)) + (prelude-ido-goto-symbol symbol)) ((listp symbol) (setq name (car symbol)) (setq position (cdr symbol))) diff --git a/prelude-editor.el b/modules/prelude-editor.el similarity index 100% rename from prelude-editor.el rename to modules/prelude-editor.el diff --git a/prelude-emacs-lisp.el b/modules/prelude-emacs-lisp.el similarity index 100% rename from prelude-emacs-lisp.el rename to modules/prelude-emacs-lisp.el diff --git a/prelude-global-keybindings.el b/modules/prelude-global-keybindings.el similarity index 97% rename from prelude-global-keybindings.el rename to modules/prelude-global-keybindings.el index 3a692a6..12f4493 100644 --- a/prelude-global-keybindings.el +++ b/modules/prelude-global-keybindings.el @@ -49,8 +49,6 @@ (global-set-key (kbd "M-i") 'prelude-ido-goto-symbol) ;; File finding -(global-set-key (kbd "C-x M-f") 'ido-find-file-other-window) -(global-set-key (kbd "C-x C-M-f") 'projectile-jump-to-project-file) (global-set-key (kbd "C-x f") 'prelude-recentf-ido-find-file) (global-set-key (kbd "C-c r") 'bury-buffer) (global-set-key (kbd "M-`") 'file-cache-minibuffer-complete) diff --git a/prelude-haskell.el b/modules/prelude-haskell.el similarity index 100% rename from prelude-haskell.el rename to modules/prelude-haskell.el diff --git a/prelude-latex.el b/modules/prelude-latex.el similarity index 100% rename from prelude-latex.el rename to modules/prelude-latex.el diff --git a/prelude-lisp.el b/modules/prelude-lisp.el similarity index 100% rename from prelude-lisp.el rename to modules/prelude-lisp.el diff --git a/prelude-markdown.el b/modules/prelude-markdown.el similarity index 100% rename from prelude-markdown.el rename to modules/prelude-markdown.el diff --git a/prelude-packages.el b/modules/prelude-packages.el similarity index 97% rename from prelude-packages.el rename to modules/prelude-packages.el index b2ab514..ee56078 100644 --- a/prelude-packages.el +++ b/modules/prelude-packages.el @@ -43,7 +43,7 @@ ;; TODO find a way to get inf-ruby 2.2.2 into Marmalade (defvar prelude-packages - '(clojure-mode coffee-mode deft gist haml-mode + '(auctex clojure-mode coffee-mode deft gist haml-mode haskell-mode magit markdown-mode paredit projectile sass-mode scss-mode yaml-mode yari yasnippet) "A list of packages to ensure are installed at launch.") diff --git a/prelude-perl.el b/modules/prelude-perl.el similarity index 100% rename from prelude-perl.el rename to modules/prelude-perl.el diff --git a/prelude-ruby.el b/modules/prelude-ruby.el similarity index 100% rename from prelude-ruby.el rename to modules/prelude-ruby.el diff --git a/prelude-ui.el b/modules/prelude-ui.el similarity index 100% rename from prelude-ui.el rename to modules/prelude-ui.el diff --git a/prelude-xml.el b/modules/prelude-xml.el similarity index 100% rename from prelude-xml.el rename to modules/prelude-xml.el