commit dfd8c535b4a2e82b584325c3e97831b46f34cacd
Author: Hiltjo Posthuma <[email protected]>
Date: Sun Feb 27 22:21:45 2022 +0100
Revert "ST Patch: 'config.def.h'"
This reverts commit 069b1c785e4429182c6d7efd2ea35a81f2810a4c.
This patch makes it only more confusing. config.def.h is intended as the
default config file.
diff --git a/st.suckless.org/patches/configdefh/index.md
b/st.suckless.org/patches/configdefh/index.md
deleted file mode 100644
index 2eae865f..00000000
--- a/st.suckless.org/patches/configdefh/index.md
+++ /dev/null
@@ -1,15 +0,0 @@
-configdefh
-===========
-
-Description
------------
-
-This patch allows you to use the `config.def.h` file as your config rather
than the `config.h` file, making it easier to apply other patches as you no
longer need to worry about conflicts with `config.h`.
-
-Download
----------
-* [st-configdefh-20220227-1461317.diff](st-configdefh-20220227-1461317.diff)
-
-Authors
--------
-* Rebecca Taylor <[email protected]>
diff --git
a/st.suckless.org/patches/configdefh/st-configdefh-20220227-1461317.diff
b/st.suckless.org/patches/configdefh/st-configdefh-20220227-1461317.diff
deleted file mode 100644
index 1c8356f9..00000000
--- a/st.suckless.org/patches/configdefh/st-configdefh-20220227-1461317.diff
+++ /dev/null
@@ -1,82 +0,0 @@
-From 14613172141adaa17c3cc1b4b67d6bbc90b25905 Mon Sep 17 00:00:00 2001
-From: Rebecca White <[email protected]>
-Date: Sun, 27 Feb 2022 15:07:38 +0000
-Subject: [PATCH] Use config.def.h Instead of config.h
-
-Use 'config.def.h' instead of using the 'config.h' file for
-configuration. This avoids conflicts with other patches that use
-'config.def.h'
----
- Makefile | 9 +++------
- x.c | 10 +++++-----
- 2 files changed, 8 insertions(+), 11 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 470ac86..ab1d9b8 100644
---- a/Makefile
-+++ b/Makefile
-@@ -15,16 +15,13 @@ options:
- @echo "LDFLAGS = $(STLDFLAGS)"
- @echo "CC = $(CC)"
-
--config.h:
-- cp config.def.h config.h
--
- .c.o:
- $(CC) $(STCFLAGS) -c $<
-
--st.o: config.h st.h win.h
--x.o: arg.h config.h st.h win.h
-+st.o: config.def.h st.h win.h
-+x.o: arg.h config.def.h st.h win.h
-
--$(OBJ): config.h config.mk
-+$(OBJ): config.def.h config.mk
-
- st: $(OBJ)
- $(CC) -o $@ $(OBJ) $(STLDFLAGS)
-diff --git a/x.c b/x.c
-index cd96575..0c78b1a 100644
---- a/x.c
-+++ b/x.c
-@@ -20,7 +20,7 @@ char *argv0;
- #include "st.h"
- #include "win.h"
-
--/* types used in config.h */
-+/* types used in config.def.h */
- typedef struct {
- uint mod;
- KeySym keysym;
-@@ -50,7 +50,7 @@ typedef struct {
- #define XK_NO_MOD 0
- #define XK_SWITCH_MOD (1<<13|1<<14)
-
--/* function definitions used in config.h */
-+/* function definitions used in config.def.h */
- static void clipcopy(const Arg *);
- static void clippaste(const Arg *);
- static void numlock(const Arg *);
-@@ -60,8 +60,8 @@ static void zoomabs(const Arg *);
- static void zoomreset(const Arg *);
- static void ttysend(const Arg *);
-
--/* config.h for applying patches and the configuration. */
--#include "config.h"
-+/* config.def.h for applying patches and the configuration. */
-+#include "config.def.h"
-
- /* XEMBED messages */
- #define XEMBED_FOCUS_IN 4
-@@ -1855,7 +1855,7 @@ kpress(XEvent *ev)
- }
- }
-
-- /* 2. custom keys from config.h */
-+ /* 2. custom keys from config.def.h */
- if ((customkey = kmap(ksym, e->state))) {
- ttywrite(customkey, strlen(customkey), 1);
- return;
---
-2.35.1
-
