Skip to content
Browse files

Merge branch 'master' of github.com:candera/emacs

Conflicts:
        init.el
  • Loading branch information...
2 parents d30e52e + b97cb7f commit dc5512c12459377992c7bc0884b82aa58f00e144 @candera committed Dec 3, 2012
Showing with 30 additions and 0 deletions.
  1. +6 −0 .gitmodules
  2. +1 −0 expand-region
  3. +22 −0 init.el
  4. +1 −0 twittering-mode
View
6 .gitmodules
@@ -40,3 +40,9 @@
[submodule "smex"]
path = smex
url = https://github.com/nonsequitur/smex.git
+[submodule "twittering-mode"]
+ path = twittering-mode
+ url = https://github.com/hayamiz/twittering-mode.git
+[submodule "expand-region"]
+ path = expand-region
+ url = https://github.com/emacsmirror/expand-region.git
1 expand-region
@@ -0,0 +1 @@
+Subproject commit 8d5b372385b2f1a1832ff9bf2abb4344f68fffee
View
22 init.el
@@ -646,6 +646,7 @@ if the major mode is one of 'delete-trailing-whitespace-modes'"
(autoload 'clojure-mode "clojure-mode" "A major mode for Clojure" t)
(add-to-list 'auto-mode-alist '("\\.clj$" . clojure-mode))
(add-to-list 'auto-mode-alist '("\\.cljs$" . clojure-mode))
+(add-to-list 'auto-mode-alist '("\\.edn$" . clojure-mode))
(add-to-list 'auto-mode-alist '("\\.dtm$" . clojure-mode))
(add-hook 'clojure-mode-hook
@@ -1001,6 +1002,27 @@ if the major mode is one of 'delete-trailing-whitespace-modes'"
;; This is your old M-x.
(global-set-key (kbd "C-c C-c M-x") 'execute-extended-command)
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;
+;; Twittering-mode
+;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+(add-to-list 'load-path "~/.emacs.d/custom/twittering-mode")
+(require 'twittering-mode)
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;
+;; expand-region
+;; https://github.com/emacsmirror/expand-region.git
+;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+(add-to-list 'load-path "~/.emacs.d/custom/expand-region")
+(require 'expand-region)
+(global-set-key (kbd "C-=") 'er/expand-region)
+
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;
;; Miscellaneous customizations
1 twittering-mode
@@ -0,0 +1 @@
+Subproject commit c692ee9bb5d54208038776ea4429900e9eddcfc5

0 comments on commit dc5512c

Please sign in to comment.
Something went wrong with that request. Please try again.