Merge remote-tracking branch 'upstream/develop'

3 files changed, 2 insertions, 5 deletions

diff --git a/users/gourdo1/autocorrect/autocorrection.c b/users/gourdo1/autocorrect/autocorrection.c
index bc711016d9..dae62d37a2 100644
--- a/users/gourdo1/autocorrect/autocorrection.c
+++ b/users/gourdo1/autocorrect/autocorrection.c
@@ -71,7 +71,7 @@ bool process_autocorrection(uint16_t keycode, keyrecord_t* record) {
           break;
 
         // NOTE: Space Cadet keys expose no info to check whether they are being
-        // tapped vs. held. This makes autocorrection ambiguous, e.g. KC_LCPO might
+        // tapped vs. held. This makes autocorrection ambiguous, e.g. SC_LCPO might
         // be '(', which we would treat as a word break, or it might be shift, which
         // we would treat as having no effect. To behave cautiously, we allow Space
         // Cadet keycodes to fall to the logic below and clear autocorrection state.
diff --git a/users/gourdo1/gourdo1.c b/users/gourdo1/gourdo1.c
index 26ecd8c1c0..b724a2f48d 100644
--- a/users/gourdo1/gourdo1.c
+++ b/users/gourdo1/gourdo1.c
@@ -593,7 +593,7 @@ bool caps_word_press_user(uint16_t keycode) {
 // Turn on/off NUM LOCK if current state is different
 void activate_numlock(bool turn_on) {
     if (IS_HOST_LED_ON(USB_LED_NUM_LOCK) != turn_on) {
-        tap_code(KC_NUMLOCK);
+        tap_code(KC_NUM_LOCK);
     }
 }
 
diff --git a/users/gourdo1/gourdo1.h b/users/gourdo1/gourdo1.h
index ecf6eaf25d..a198fd0805 100644
--- a/users/gourdo1/gourdo1.h
+++ b/users/gourdo1/gourdo1.h
@@ -17,9 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-// DEFINE MACROS
-#define ARRAYSIZE(arr) sizeof(arr) / sizeof(arr[0])
-
 // LAYERS -- Note: to avoid compile problems, make sure total layers matches DYNAMIC_KEYMAP_LAYER_COUNT defined in config.h (where _COLEMAK layer is defined)
 enum custom_user_layers {
     _BASE,