From 15dd3bf7481143411a0598770ce0eabc7dd02213 Mon Sep 17 00:00:00 2001
From: Alan Pearce
Date: Tue, 27 Aug 2013 13:07:22 +0100
Subject: Emacs: Fix control key issue on OSX

---
 emacs/init.el | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/emacs/init.el b/emacs/init.el
index 0f05bc0c..41daa4a5 100644
--- a/emacs/init.el
+++ b/emacs/init.el
@@ -469,10 +469,12 @@ Values: `desktop', `server', `laptop'")
 (when (eq system-type 'darwin)
   (set-keyboard-coding-system nil)
   (setq mac-option-modifier 'meta
-        mac-control-modifier 'command
+        mac-right-option-modifier 'left
+        mac-control-modifier 'super
         mac-right-control-modifier 'left
         mac-command-modifier 'control
-        mac-right-command-modifier 'left))
+        mac-right-command-modifier 'left
+        mac-function-modifier 'hyper))
 
 (unbind-key "<f4>")
 (bind-key "<f5>" #'compile)
-- 
cgit 1.4.1


From 5ac5ba3ba8e7b78736ff0e12a065713658579063 Mon Sep 17 00:00:00 2001
From: Alan Pearce
Date: Tue, 27 Aug 2013 13:08:22 +0100
Subject: Emacs: unbind unhelpful s-n key

---
 emacs/init.el | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/emacs/init.el b/emacs/init.el
index 41daa4a5..499636f9 100644
--- a/emacs/init.el
+++ b/emacs/init.el
@@ -492,6 +492,8 @@ Values: `desktop', `server', `laptop'")
 
 (bind-key "C-c i" #'ucs-insert)
 
+(unbind-key "s-n")
+
 (set-register ?e `(file . ,*init-file*))
 
 ;; Enable narrowing functions C-x n
-- 
cgit 1.4.1


From 114df7733b3534738c23e170b563cb7abd29da43 Mon Sep 17 00:00:00 2001
From: Alan Pearce
Date: Tue, 27 Aug 2013 13:09:35 +0100
Subject: Emacs: add extra keybinding for projectile-find-file

---
 emacs/init.el | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/emacs/init.el b/emacs/init.el
index 499636f9..e7e080ce 100644
--- a/emacs/init.el
+++ b/emacs/init.el
@@ -494,6 +494,8 @@ Values: `desktop', `server', `laptop'")
 
 (unbind-key "s-n")
 
+(bind-key "s-x" (define-prefix-command 'super-x-map))
+
 (set-register ?e `(file . ,*init-file*))
 
 ;; Enable narrowing functions C-x n
@@ -664,7 +666,8 @@ Values: `desktop', `server', `laptop'")
 
 (use-package projectile
   :ensure t
-  :bind (("C-c C-f" . projectile-find-file))
+  :bind (("C-c C-f" . projectile-find-file)
+         ("s-x s-f" . projectile-find-file))
   :commands (projectile-global-mode))
 
 (use-package project-persist
-- 
cgit 1.4.1


From b064712dfa6f4a3e727ad18568fc9f852c3e2c0d Mon Sep 17 00:00:00 2001
From: Alan Pearce
Date: Wed, 28 Aug 2013 09:00:11 +0100
Subject: Emacs: Switch control and command on OSX

---
 emacs/init.el | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/emacs/init.el b/emacs/init.el
index e7e080ce..916cc420 100644
--- a/emacs/init.el
+++ b/emacs/init.el
@@ -470,9 +470,9 @@ Values: `desktop', `server', `laptop'")
   (set-keyboard-coding-system nil)
   (setq mac-option-modifier 'meta
         mac-right-option-modifier 'left
-        mac-control-modifier 'super
+        mac-control-modifier 'control
         mac-right-control-modifier 'left
-        mac-command-modifier 'control
+        mac-command-modifier 'super
         mac-right-command-modifier 'left
         mac-function-modifier 'hyper))
 
-- 
cgit 1.4.1


From 6741fa31da1ac4d2e14114fdf2a3d6d841ac6962 Mon Sep 17 00:00:00 2001
From: Alan Pearce
Date: Wed, 28 Aug 2013 16:33:18 +0100
Subject: Emacs: Unbind more unhelpful Mac keybindings

---
 emacs/init.el | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/emacs/init.el b/emacs/init.el
index 1b7b4950..b445c1e4 100644
--- a/emacs/init.el
+++ b/emacs/init.el
@@ -498,7 +498,10 @@ Values: `desktop', `server', `laptop'")
 
 (bind-key "C-c i" #'ucs-insert)
 
+(unbind-key "s-h")
 (unbind-key "s-n")
+(unbind-key "s-p")
+(unbind-key "s-w")
 
 (bind-key "s-x" (define-prefix-command 'super-x-map))
 
-- 
cgit 1.4.1


From 2e6468f9225fbb9ef889271cdb48248f3d345d52 Mon Sep 17 00:00:00 2001
From: Alan Pearce
Date: Wed, 28 Aug 2013 16:33:57 +0100
Subject: Emacs: add s-G magit keybinding like s-D

---
 emacs/init.el | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/emacs/init.el b/emacs/init.el
index b445c1e4..ab1d3c2b 100644
--- a/emacs/init.el
+++ b/emacs/init.el
@@ -750,7 +750,8 @@ Also returns nil if pid is nil."
 
 (use-package magit
   :commands (magit-status)
-  :bind (("C-x g" . magit-status))
+  :bind (("C-x g" . magit-status)
+         ("s-G" . magit-status))
   :init (add-hook 'magit-mode-hook #'magit-load-config-extensions))
 
 ;;;; Spelling
-- 
cgit 1.4.1


From a4fd9c1ab8fd8a7e1dc2695876ede8c83f5eaff4 Mon Sep 17 00:00:00 2001
From: Alan Pearce
Date: Wed, 28 Aug 2013 17:07:31 +0100
Subject: Emacs: unbind s-m

---
 emacs/init.el | 1 +
 1 file changed, 1 insertion(+)

diff --git a/emacs/init.el b/emacs/init.el
index ab1d3c2b..4eab004e 100644
--- a/emacs/init.el
+++ b/emacs/init.el
@@ -502,6 +502,7 @@ Values: `desktop', `server', `laptop'")
 (unbind-key "s-n")
 (unbind-key "s-p")
 (unbind-key "s-w")
+(unbind-key "s-m")
 
 (bind-key "s-x" (define-prefix-command 'super-x-map))
 
-- 
cgit 1.4.1