From 32659004d7d8b3cd6c6927a55d4ec5acd2dd7ef7 Mon Sep 17 00:00:00 2001
From: Taylor Bockman <tbockman@taylorbockman.com>
Date: Wed, 23 Dec 2015 00:59:31 -0800
Subject: [PATCH] Add expand-region and config for it

---
 .gitignore                  |  3 +++
 dotfiles/emacs.d/init.el    | 10 ++++++++++
 dotfiles/emacs.d/package.el |  2 +-
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index ea25380..27e17e3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,3 +22,6 @@ elpa/
 projectile-bookmarks.eld
 *.dat
 helm-adaptive-history
+/smex-items
+/.smex-items
+/smex-save-file
diff --git a/dotfiles/emacs.d/init.el b/dotfiles/emacs.d/init.el
index abe8899..3b7bb53 100644
--- a/dotfiles/emacs.d/init.el
+++ b/dotfiles/emacs.d/init.el
@@ -274,6 +274,13 @@
 (global-fci-mode t)
 
 ;;--------------------------------------------------------------------------------------
+;; Expand region settings
+;;--------------------------------------------------------------------------------------
+
+(require 'expand-region)
+(pending-delete-mode t) ; Selected region contents are replaced on typing
+
+;;--------------------------------------------------------------------------------------
 ;; Line Numbering - Note: Might not look good with files with 10,000 or more lines
 ;;--------------------------------------------------------------------------------------
 
@@ -511,6 +518,9 @@
 ;; Relative line numbering
 (global-set-key (kbd "C-c r") 'linum-relative-toggle)
 
+;; Expand region
+(global-set-key (kbd "C-@") 'er/expand-region)
+
 ;;--------------------------------------------------------------------------------------
 ;; Theme
 ;;--------------------------------------------------------------------------------------
diff --git a/dotfiles/emacs.d/package.el b/dotfiles/emacs.d/package.el
index 82c5b73..053d33d 100644
--- a/dotfiles/emacs.d/package.el
+++ b/dotfiles/emacs.d/package.el
@@ -1,6 +1,6 @@
 (require 'cl)
 
-(defvar my-packages '(ag auto-complete clojure-mode coffee-mode css-mode circe framemove flycheck
+(defvar my-packages '(ag auto-complete clojure-mode coffee-mode css-mode circe expand-region framemove flycheck
                          esh-help fill-column-indicator flycheck-clojure flycheck-haskell flycheck-rust
                          flycheck-pos-tip gitignore-mode golden-ratio haskell-mode swiper linum-relative
                          js2-mode less-css-mode magit neotree paredit scala-mode2 scss-mode smex powerline