summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortmk <nobody@nowhere>2013-03-20 00:37:32 +0900
committertmk <nobody@nowhere>2013-03-20 00:37:32 +0900
commitecb7550a91a7fb9a2e7e717f3c0d40d30fd92121 (patch)
tree9d7ed14772aa3faedce7e3993b62950f3d3be1e2
parent9757f960f9f50841df6651a1a52f63eb9aae242b (diff)
Add NO_ACTION_FUNCTION config option
-rw-r--r--common/action.c4
-rw-r--r--keyboard/gh60/config.h1
2 files changed, 5 insertions, 0 deletions
diff --git a/common/action.c b/common/action.c
index eda3a6d328..51b11d1bc2 100644
--- a/common/action.c
+++ b/common/action.c
@@ -688,14 +688,18 @@ static void process_action(keyrecord_t *record)
#endif
/* Extentions */
+#ifndef NO_ACTION_MACRO
case ACT_MACRO:
action_macro_play(action_get_macro(record, action.func.id, action.func.opt));
break;
+#endif
case ACT_COMMAND:
break;
+#ifndef NO_ACTION_FUNCTION
case ACT_FUNCTION:
action_function(record, action.func.id, action.func.opt);
break;
+#endif
default:
break;
}
diff --git a/keyboard/gh60/config.h b/keyboard/gh60/config.h
index bf58076442..2e2387aa29 100644
--- a/keyboard/gh60/config.h
+++ b/keyboard/gh60/config.h
@@ -64,5 +64,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define NO_ACTION_OVERLAY
#define NO_ACTION_TAPPING
#define NO_ACTION_MACRO
+#define NO_ACTION_FUNCTION
#endif