merge(): Pulls latest from master

2017-01-23 18:05:58 -05:00 · 2017-01-23 18:05:58 -05:00 · 2076f42c00
commit 2076f42c00
parent 66345e287b 4697864db7
5 changed files with 521 additions and 10 deletions
--- a/configs/.emacs
+++ b/configs/.emacs
@ -1,4 +1,4 @@
-;; William Carroll's Emacs configuration
+; William Carroll's Emacs configuration


 ;; From `https://github.com/melpa/melpa`
@ -104,6 +104,11 @@
 (global-set-key (kbd "<s-return>") 'toggle-frame-fullscreen)


+;; Dired Settings
+(require 'dired)
+(define-key dired-mode-map (kbd "c") 'find-file)
+
+
 ;; Helm Settings
 (require 'helm)
 (require 'helm-config)