summaryrefslogtreecommitdiff
path: root/.emacs
diff options
context:
space:
mode:
Diffstat (limited to '.emacs')
-rw-r--r--.emacs49
1 files changed, 43 insertions, 6 deletions
diff --git a/.emacs b/.emacs
index 55bdb90..cfc07ba 100644
--- a/.emacs
+++ b/.emacs
@@ -17,18 +17,26 @@
("marmalade" . "http://marmalade-repo.org/packages/")
("gnu" . "http://elpa.gnu.org/packages/")))
+
(add-to-list 'load-path "~/.emacs.d/")
(add-to-list 'load-path "~/.emacs.d/el-get/el-get")
-(require 'el-get)
-(add-to-list 'el-get-recipe-path "~/.emacs.d/el-get-recipes")
+(unless (require 'el-get nil t)
+ (url-retrieve
+ "https://github.com/dimitri/el-get/raw/master/el-get-install.el"
+ (lambda (s)
+ (end-of-buffer)
+ (eval-print-last-sexp))))
+
(setq el-get-sources
'(el-get
package
rainbow-delimiters
php-mode-improved
- mmm-mode
+ mmm-mode
dtrt-indent
- folding
+ magit
+ coffee-mode
+ folding
apel flim semi wanderlust
(:name color-theme
:after (lambda ()
@@ -50,6 +58,10 @@
(setq org-hide-leading-stars t)
(setq org-log-done 'time)))
(:name identica-mode
+ :type http-tar
+ :options ("xzf")
+ :url "http://git.savannah.gnu.org/cgit/identica-mode.git/snapshot/identica-mode-1.1.tar.gz"
+ :load "identica-mode.el"
:after (lambda ()
(load-identica-mode)))
(:name smarttabs
@@ -59,7 +71,8 @@
(autopair-global-mode 1)
(setq autopair-autowrap t)))
))
-(el-get)
+(when (require 'el-get nil t)
+ (el-get 'sync))
(add-hook 'text-mode-hook 'turn-on-auto-fill)
(add-hook 'after-make-frame-functions
@@ -124,8 +137,32 @@
(setq browse-url-generic-program (executable-find "v-www-browser")
browse-url-browser-function 'browse-url-generic)
+(add-hook 'lisp-mode-hook
+ (function
+ (lambda ()
+ (make-local-variable 'indent-tabs-mode)
+ (setq indent-tabs-mode nill))
+ ))
+
+(defun coffee-custom ()
+ "coffee-mode-hook"
+ (set (make-local-variable 'tab-width) 2))
+
+(add-hook 'coffee-mode-hook
+ '(lambda() (coffee-custom)))
+
(add-hook 'term-mode-hook
- #'(lambda () (setq autopair-dont-activate t)))
+ (function
+ (lambda ()
+ (setq term-prompt-regexp "^[^#$%>\n]*[#$%>] *")
+ (make-local-variable 'mouse-yank-at-point)
+ ;(make-local-variable 'transient-mark-mode)
+ (setq mouse-yank-at-point t)
+ ;(setq transient-mark-mode nil)
+ (auto-fill-mode -1)
+ (setq tab-width 8 )
+ (setq autopair-dont-activate t)) ;; Don't let autopair break ansi-term
+ ))
;(require 'flymake)
;(add-hook 'php-mode-hook (lambda() (flymake-mode 1)))