From 71cdfe11682cf63c262380747d8a1b3d48a6bad0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stephan=20Bo=CC=88sebeck?=
 <stephan.boesebeck@holidayinsider.com>
Date: Sat, 2 Apr 2016 15:14:14 +0200
Subject: [PATCH] new keymap

---
 keyboard/ergodox_ez/keymaps/osx_de/keymap.c | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/keyboard/ergodox_ez/keymaps/osx_de/keymap.c b/keyboard/ergodox_ez/keymaps/osx_de/keymap.c
index df8d9965..a1b47ae8 100644
--- a/keyboard/ergodox_ez/keymaps/osx_de/keymap.c
+++ b/keyboard/ergodox_ez/keymaps/osx_de/keymap.c
@@ -17,6 +17,7 @@
 #define M_DE_CIRC_CTRLCMD 13
 #define M_TOGGLE_5 14
 #define M_CTL_SFT_HASH 15
+#define M_LGUI_SHFT 16
 
 #define SM_SMILE 4
 #define SM_SMIRK 5
@@ -67,7 +68,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
              KC_RGUI,     DE_Z,   DE_U,   DE_I,   DE_O,   DE_P,         	DE_UE,
                           DE_H,   DE_J,   DE_K,   DE_L,   DE_OE,		ALT_T(DE_AE),
              KC_RALT,	  DE_N,   DE_M,   DE_COMM,DE_DOT, CTL_T(DE_MINS),   	KC_RSFT,
-                                  KC_LEFT,  KC_RIGHT,LGUI(KC_LSFT),LALT(KC_LSFT),        LT(SYMB,DE_PLUS),
+                                  KC_LEFT,  KC_RIGHT,M(M_LGUI_SHFT),LALT(KC_LSFT),        LT(SYMB,DE_PLUS),
              TG(4),	  ALL_T(DE_ACUT),
              KC_PGUP,
              KC_PGDN,KC_ENT, KC_SPC
@@ -313,6 +314,13 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
 			}
 		}
 		break;
+	case M_LGUI_SHFT:
+		if (record->event.pressed){
+			return MACRO(D(LGUI),D(LSFT),END);
+		}else{
+			return MACRO(U(LGUI),U(LSFT),END);
+		}
+		break;
 	case M_CTL_SFT_HASH:
 		if (record->event.pressed) {
 			start=timer_read();