cleanup & small fixes

This commit is contained in:
Bozhidar Batsov 2011-10-11 00:38:10 +03:00
parent c198fd49f1
commit 4b9386b555
18 changed files with 5 additions and 6 deletions

View file

@ -39,10 +39,11 @@
(push "/usr/local/bin" exec-path)) (push "/usr/local/bin" exec-path))
(defvar prelude-dir "~/.emacs.d/") (defvar prelude-dir "~/.emacs.d/")
(defvar modules-dir (concat prelude-dir "modules/"))
(defvar vendor-dir (concat prelude-dir "vendor/")) (defvar vendor-dir (concat prelude-dir "vendor/"))
(add-to-list 'load-path prelude-dir) (add-to-list 'load-path prelude-dir)
(add-to-list 'load-path modules-dir)
(add-to-list 'load-path vendor-dir) (add-to-list 'load-path vendor-dir)
(require 'prelude-ui) (require 'prelude-ui)

View file

@ -260,7 +260,7 @@ there's a region, all lines that region covers will be duplicated."
(while (progn (while (progn
(imenu--cleanup) (imenu--cleanup)
(setq imenu--index-alist nil) (setq imenu--index-alist nil)
(ido-goto-symbol (imenu--make-index-alist)) (prelude-ido-goto-symbol (imenu--make-index-alist))
(setq selected-symbol (setq selected-symbol
(ido-completing-read "Symbol? " symbol-names)) (ido-completing-read "Symbol? " symbol-names))
(string= (car imenu--rescan-item) selected-symbol))) (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) (let (name position)
(cond (cond
((and (listp symbol) (imenu--subalist-p symbol)) ((and (listp symbol) (imenu--subalist-p symbol))
(ido-goto-symbol symbol)) (prelude-ido-goto-symbol symbol))
((listp symbol) ((listp symbol)
(setq name (car symbol)) (setq name (car symbol))
(setq position (cdr symbol))) (setq position (cdr symbol)))

View file

@ -49,8 +49,6 @@
(global-set-key (kbd "M-i") 'prelude-ido-goto-symbol) (global-set-key (kbd "M-i") 'prelude-ido-goto-symbol)
;; File finding ;; 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-x f") 'prelude-recentf-ido-find-file)
(global-set-key (kbd "C-c r") 'bury-buffer) (global-set-key (kbd "C-c r") 'bury-buffer)
(global-set-key (kbd "M-`") 'file-cache-minibuffer-complete) (global-set-key (kbd "M-`") 'file-cache-minibuffer-complete)

View file

@ -43,7 +43,7 @@
;; TODO find a way to get inf-ruby 2.2.2 into Marmalade ;; TODO find a way to get inf-ruby 2.2.2 into Marmalade
(defvar prelude-packages (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 haskell-mode magit markdown-mode paredit projectile
sass-mode scss-mode yaml-mode yari yasnippet) sass-mode scss-mode yaml-mode yari yasnippet)
"A list of packages to ensure are installed at launch.") "A list of packages to ensure are installed at launch.")