Merge branch 'master' of github.com:bbatsov/prelude

Conflicts:
	core/prelude-core.el
This commit is contained in:
Bozhidar Batsov 2013-01-30 18:07:00 +02:00
commit 0ec13719da

View file

@ -43,6 +43,14 @@
(if (file-exists-p (concat buffer-file-name "c")) (if (file-exists-p (concat buffer-file-name "c"))
(delete-file (concat buffer-file-name "c")))))) (delete-file (concat buffer-file-name "c"))))))
(defun prelude-visit-ielm ()
(interactive)
(if (not (get-buffer "*ielm*"))
(ielm)
(switch-to-buffer-other-window "*ielm*")))
(define-key emacs-lisp-mode-map (kbd "C-c C-z") 'prelude-visit-ielm)
(defun prelude-emacs-lisp-mode-defaults () (defun prelude-emacs-lisp-mode-defaults ()
(run-hooks 'prelude-lisp-coding-hook) (run-hooks 'prelude-lisp-coding-hook)
(turn-on-eldoc-mode) (turn-on-eldoc-mode)