Permalink
Browse files

Merge branch 'master' of github.com:alandipert/alan-emacs.d

  • Loading branch information...
2 parents 47489a7 + 6611bfc commit 1f726a3432638c383195da4fc98510952ce36920 @alandipert committed Mar 29, 2012
Showing with 17 additions and 18 deletions.
  1. +17 −18 init.el
View
35 init.el
@@ -80,6 +80,10 @@
:after (lambda ()
(add-to-list 'auto-mode-alist '("\\.clj.*$" . clojure-mode))))
+ (:name ruby-mode :type elpa
+ :after (lambda ()
+ (add-to-list 'auto-mode-alist '("\\.rake" . ruby-mode))))
+
(:name slime-repl :type elpa)
(:name slime
@@ -88,6 +92,11 @@
(setq slime-protocol-version 'ignore)
(setq font-lock-verbose nil)))
+ (:name dired-details
+ :after (lambda ()
+ (require 'dired-details)
+ (dired-details-install)))
+
(:name find-file-in-project
:type git
:url "git://github.com/dburger/find-file-in-project.git"
@@ -143,7 +152,6 @@
'(ac-slime
auto-complete
coffee-mode
- dired-details
durendal
elein
el-get
@@ -153,7 +161,6 @@
org-mode
ruby-block
ruby-end
- ruby-mode
swank-clojure
textile-mode
yaml-mode
@@ -241,21 +248,11 @@
(ad-activate 'isearch-search)))
;;; vim dt emulation
-(defun zap-until-char (arg char)
- "Kill up to ARGth occurrence of CHAR.
-Case is ignored if `case-fold-search' is non-nil in the current buffer.
-Goes backward if ARG is negative; error if CHAR not found."
- (interactive "p\ncZap until char: ")
- (with-no-warnings
- (if (char-table-p translation-table-for-input)
- (setq char (or (aref translation-table-for-input char) char))))
- (kill-region (point)
- (progn
- (search-forward (char-to-string char) nil nil arg)
- (1- (point)))
- (backward-char)))
-
-(global-set-key (kbd "M-z") 'zap-until-char)
+(defadvice zap-to-char (after my-zap-to-char-advice (arg char) activate)
+ "Kill up to the ARG'th occurence of CHAR, and leave CHAR.
+ The CHAR is replaced and the point is put before CHAR."
+ (insert char)
+ (forward-char -1))
;;; use ibuffer
;;; http://martinowen.net/blog/2010/02/tips-for-emacs-ibuffer.html
@@ -273,7 +270,9 @@ Goes backward if ARG is negative; error if CHAR not found."
(define-key global-map "\C-ca" 'org-agenda)
(setq org-hide-leading-stars t
- org-todo-keywords (quote ((sequence "TODO" "ONGOING" "DONE"))))
+ org-todo-keywords (quote ((sequence "TODO" "ONGOING" "DONE")))
+ org-todo-keyword-faces
+ '(("ONGOING" . "orange")))
;;
;; linux fullscreen

0 comments on commit 1f726a3

Please sign in to comment.