sled

чување 6ed1c5a1f6d7ae59a0d15141399958c6a04586d2
родитељ 043d9169e8d8982c085942c5b26b87be42a9aa05
Аутор: Страхиња Радић <sr@strahinja.org>
Датум:   Thu,  8 Aug 2024 12:10:50 +0200

patch/{bw,dark}-theme.patch: Remove leftover artefacts from merge

Diffstat:
M
patch/bw-theme.patch
 | 
72
+++++-------------------------------------------------------------------
M
patch/dark-theme.patch
 | 
76
+++++++---------------------------------------------------------------------

измењених датотека: 2, додавања: 12(+), брисања: 136(-)
diff --git a/patch/bw-theme.patch b/patch/bw-theme.patch
@@ -1,18 +1,17 @@
-From ca7687f1785564504c12b3615b6f7390fad7871c Mon Sep 17 00:00:00 2001
+From efb3f72f149cdd378b76203f99f0d31d06a988f0 Mon Sep 17 00:00:00 2001
 From: Страхиња Радић <sr@strahinja.org>
-Date: Thu Aug  8 10:00:33 2024 UTC
+Date: Thu Aug  8 10:09:03 2024 UTC
 Subject: [PATCH] Set black and white theme
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
 
 ---
- config.def.h             |  19+  19-
- patch/light-theme.patch  |  13+  12-
- 2 files changed, 32 insertions(+), 31 deletions(-)
+ config.def.h  |  19+  19-
+ 1 file changed, 19 insertions(+), 19 deletions(-)
 
 diff --git a/config.def.h b/config.def.h
-index e1d7d8f67..ca7687f17 100644
+index 043d9169e..efb3f72f1 100644
 --- a/config.def.h
 +++ b/config.def.h
 @@ -5,33 +5,33 @@
@@ -68,67 +67,6 @@ index e1d7d8f67..ca7687f17 100644
  #define TEXT_FG	      TB_DEFAULT
  #define TEXT_BG	      TB_DEFAULT
  #define TITLE_FG      TB_BLACK
-diff --git a/patch/light-theme.patch b/patch/light-theme.patch
-index e1d7d8f67..ca7687f17 100644
---- a/patch/light-theme.patch
-+++ b/patch/light-theme.patch
-@@ -1,21 +1,21 @@
--From 36c366ef070b1df95f6f12a4333ab324b25e96eb Mon Sep 17 00:00:00 2001
-+From a7ab6b823ddc292a35afd30035be7ad6c5cf762b Mon Sep 17 00:00:00 2001
- From: Страхиња Радић <sr@strahinja.org>
--Date: Thu Aug  8 10:04:21 2024 UTC
-+Date: Mon Jul 15 12:49:06 2024 UTC
- Subject: [PATCH] Set light theme
- MIME-Version: 1.0
- Content-Type: text/plain; charset=UTF-8
- Content-Transfer-Encoding: 8bit
- 
- ---
-- config.def.h  |  34+  34-
-+ config.def.h  |  35+  30-
-  sled.c        |   1+   0-
-- 2 files changed, 35 insertions(+), 34 deletions(-)
-+ 2 files changed, 36 insertions(+), 30 deletions(-)
- 
- diff --git a/config.def.h b/config.def.h
--index 39043fce0..36c366ef0 100644
-+index ee63d0e73..a7ab6b823 100644
- --- a/config.def.h
- +++ b/config.def.h
--@@ -2,40 +2,40 @@
-+@@ -2,40 +2,45 @@
-   * any later version. Copyright (C) 2022-2024  Страхиња Радић.
-   * See the file LICENSE for exact copyright and license details. */
-  
-@@ -49,10 +49,11 @@ index 39043fce0..36c366ef0 100644
- -#define STATUS_4_BG   TB_BLUE
- -#define STATUS_5_FG   TB_WHITE
- -#define STATUS_5_BG   TB_BLUE
---#define TEXT_FG	      TB_DEFAULT
---#define TEXT_BG	      TB_DEFAULT
---#define TITLE_FG      TB_BLACK
---#define TITLE_BG      TB_WHITE
-+ #define TEXT_FG	      TB_DEFAULT
-+ #define TEXT_BG	      TB_DEFAULT
-+ #define TITLE_FG      TB_BLACK
-+ #define TITLE_BG      TB_WHITE
-++=======
- +#define DLG_FG	      0x10
- +#define DLG_BG	      0x2d
- +#define ERROR_FG      0xbe
-@@ -91,10 +92,10 @@ index 39043fce0..36c366ef0 100644
-  extern const int backup_fail;
-  extern const char* backup_suffix;
- diff --git a/sled.c b/sled.c
--index 39043fce0..36c366ef0 100644
-+index ee63d0e73..a7ab6b823 100644
- --- a/sled.c
- +++ b/sled.c
--@@ -3210,6 +3210,7 @@ main_skip_backups:
-+@@ -3091,6 +3091,7 @@ main_skip_backups:
-  
-  init_termbox:
-  	tb_init();
 --
 2.44.1
 
diff --git a/patch/dark-theme.patch b/patch/dark-theme.patch
@@ -1,19 +1,18 @@
-From 693a3ee14a087cc6a7ef475d0f7e6971341e9998 Mon Sep 17 00:00:00 2001
+From 032f35d59a9e8855cb5d3195095619f7095aec3b Mon Sep 17 00:00:00 2001
 From: Страхиња Радић <sr@strahinja.org>
-Date: Thu Aug  8 10:00:37 2024 UTC
+Date: Thu Aug  8 10:08:47 2024 UTC
 Subject: [PATCH] Set dark theme
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
 
 ---
- config.def.h             |  34+  34-
- patch/light-theme.patch  |  13+  12-
- sled.c                   |   1+   0-
- 3 files changed, 48 insertions(+), 46 deletions(-)
+ config.def.h  |  34+  34-
+ sled.c        |   1+   0-
+ 2 files changed, 35 insertions(+), 34 deletions(-)
 
 diff --git a/config.def.h b/config.def.h
-index e1d7d8f67..693a3ee14 100644
+index 043d9169e..032f35d59 100644
 --- a/config.def.h
 +++ b/config.def.h
 @@ -2,40 +2,40 @@
@@ -91,69 +90,8 @@ index e1d7d8f67..693a3ee14 100644
  
  extern const int backup_fail;
  extern const char* backup_suffix;
-diff --git a/patch/light-theme.patch b/patch/light-theme.patch
-index e1d7d8f67..693a3ee14 100644
---- a/patch/light-theme.patch
-+++ b/patch/light-theme.patch
-@@ -1,21 +1,21 @@
--From 36c366ef070b1df95f6f12a4333ab324b25e96eb Mon Sep 17 00:00:00 2001
-+From a7ab6b823ddc292a35afd30035be7ad6c5cf762b Mon Sep 17 00:00:00 2001
- From: Страхиња Радић <sr@strahinja.org>
--Date: Thu Aug  8 10:04:21 2024 UTC
-+Date: Mon Jul 15 12:49:06 2024 UTC
- Subject: [PATCH] Set light theme
- MIME-Version: 1.0
- Content-Type: text/plain; charset=UTF-8
- Content-Transfer-Encoding: 8bit
- 
- ---
-- config.def.h  |  34+  34-
-+ config.def.h  |  35+  30-
-  sled.c        |   1+   0-
-- 2 files changed, 35 insertions(+), 34 deletions(-)
-+ 2 files changed, 36 insertions(+), 30 deletions(-)
- 
- diff --git a/config.def.h b/config.def.h
--index 39043fce0..36c366ef0 100644
-+index ee63d0e73..a7ab6b823 100644
- --- a/config.def.h
- +++ b/config.def.h
--@@ -2,40 +2,40 @@
-+@@ -2,40 +2,45 @@
-   * any later version. Copyright (C) 2022-2024  Страхиња Радић.
-   * See the file LICENSE for exact copyright and license details. */
-  
-@@ -49,10 +49,11 @@ index 39043fce0..36c366ef0 100644
- -#define STATUS_4_BG   TB_BLUE
- -#define STATUS_5_FG   TB_WHITE
- -#define STATUS_5_BG   TB_BLUE
---#define TEXT_FG	      TB_DEFAULT
---#define TEXT_BG	      TB_DEFAULT
---#define TITLE_FG      TB_BLACK
---#define TITLE_BG      TB_WHITE
-+ #define TEXT_FG	      TB_DEFAULT
-+ #define TEXT_BG	      TB_DEFAULT
-+ #define TITLE_FG      TB_BLACK
-+ #define TITLE_BG      TB_WHITE
-++=======
- +#define DLG_FG	      0x10
- +#define DLG_BG	      0x2d
- +#define ERROR_FG      0xbe
-@@ -91,10 +92,10 @@ index 39043fce0..36c366ef0 100644
-  extern const int backup_fail;
-  extern const char* backup_suffix;
- diff --git a/sled.c b/sled.c
--index 39043fce0..36c366ef0 100644
-+index ee63d0e73..a7ab6b823 100644
- --- a/sled.c
- +++ b/sled.c
--@@ -3210,6 +3210,7 @@ main_skip_backups:
-+@@ -3091,6 +3091,7 @@ main_skip_backups:
-  
-  init_termbox:
-  	tb_init();
 diff --git a/sled.c b/sled.c
-index e1d7d8f67..693a3ee14 100644
+index 043d9169e..032f35d59 100644
 --- a/sled.c
 +++ b/sled.c
 @@ -3210,6 +3210,7 @@ main_skip_backups: