aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--doc/aerc-stylesets.7.scd35
-rw-r--r--filters/colorize.c3
-rwxr-xr-xfilters/test.sh2
-rw-r--r--stylesets/blue2
-rw-r--r--stylesets/default6
-rw-r--r--stylesets/dracula2
-rw-r--r--stylesets/monochrome2
-rw-r--r--stylesets/nord2
-rw-r--r--stylesets/pink2
-rw-r--r--stylesets/solarized3
10 files changed, 53 insertions, 6 deletions
diff --git a/doc/aerc-stylesets.7.scd b/doc/aerc-stylesets.7.scd
index e270c700..d874dd44 100644
--- a/doc/aerc-stylesets.7.scd
+++ b/doc/aerc-stylesets.7.scd
@@ -378,10 +378,32 @@ selector_focused.fg = 15
completion_pill.bg = 12
completion_default.bg = 8
completion_default.fg = 15
+
+[viewer]
+url.underline = true
+url.fg = 3
+header.bold = true
+header.fg = 4
+signature.dim = true
+signature.fg = 4
+diff_meta.bold = true
+diff_chunk.fg = 6
+diff_chunk_func.fg = 6
+diff_chunk_func.dim = true
+diff_add.fg = 2
+diff_del.fg = 1
+quote_1.fg = 6
+quote_2.fg = 4
+quote_3.fg = 6
+quote_3.dim = true
+quote_4.fg = 4
+quote_4.dim = true
+quote_x.fg = 5
+quote_x.dim = true
```
-You can choose either to reset everything by starting your styleset with these
-two lines:
+You can choose either to reset everything (except in the *[viewer]* section) by
+starting your styleset with these two lines:
```
*.default=true
@@ -390,6 +412,15 @@ two lines:
Or selectively override style object attributes.
+If you want to also reset the *[viewer]* section, you need to insert the same
+two lines:
+
+```
+[viewer]
+*.default=true
+*.normal=true
+```
+
# SEE ALSO
*aerc*(1) *aerc-config*(5)
diff --git a/filters/colorize.c b/filters/colorize.c
index 36474ba9..14150154 100644
--- a/filters/colorize.c
+++ b/filters/colorize.c
@@ -389,9 +389,6 @@ static int parse_styleset(void)
}
} else if (!strcmp(buf, "[viewer]")) {
in_section = true;
- /* only disable the default theme if there is
- * a [viewer] section in the styleset */
- memset(&styles, 0, sizeof(styles));
}
}
diff --git a/filters/test.sh b/filters/test.sh
index 16d1438c..39319d6b 100755
--- a/filters/test.sh
+++ b/filters/test.sh
@@ -12,6 +12,8 @@ cat >$style <<EOF
url.fg = red
[viewer]
+*.normal=true
+*.default=true
url.underline = true # cxwlkj
header.bold= true # comment
signature.dim=true
diff --git a/stylesets/blue b/stylesets/blue
index 0d474354..4fffca0a 100644
--- a/stylesets/blue
+++ b/stylesets/blue
@@ -57,6 +57,8 @@ default.selected.bg=#005f87
completion_default.selected.bg=#005f87
[viewer]
+*.default=true
+*.normal=true
url.fg=#ffffaf
url.underline=true
header.fg=#af87ff
diff --git a/stylesets/default b/stylesets/default
index 02afe550..dd5f4a8d 100644
--- a/stylesets/default
+++ b/stylesets/default
@@ -7,7 +7,8 @@
# the aerc-stylesets(7) manpage. Please read the manual before
# modifying or creating a styleset.
-# Uncomment these two lines to reset all attributes and start from scratch.
+# Uncomment these two lines to reset all attributes (except in the [viewer]
+# section) and start from scratch.
#*.default = true
#*.normal = true
@@ -52,6 +53,9 @@
#completion_default.fg = 15
#[viewer]
+# Uncomment these two lines to reset all attributes in the [viewer] section.
+#*.default = true
+#*.normal = true
#url.underline = true
#url.fg = 3
#header.bold = true
diff --git a/stylesets/dracula b/stylesets/dracula
index f4eada3b..d22fb7e6 100644
--- a/stylesets/dracula
+++ b/stylesets/dracula
@@ -63,6 +63,8 @@ completion_default.selected.bg=#44475A
completion_default.selected.fg=white
[viewer]
+*.default=true
+*.normal=true
url.underline=true
header.bold=true
signature.dim=true
diff --git a/stylesets/monochrome b/stylesets/monochrome
index f8e3849b..42d5352d 100644
--- a/stylesets/monochrome
+++ b/stylesets/monochrome
@@ -32,6 +32,8 @@ selector_focused.reverse = true
selector_chooser.bold = true
[viewer]
+*.default = true
+*.normal = true
url.underline = true
header.bold = true
signature.dim = true
diff --git a/stylesets/nord b/stylesets/nord
index 9a3593f2..90e61186 100644
--- a/stylesets/nord
+++ b/stylesets/nord
@@ -53,6 +53,8 @@ part_*.selected.fg=#ffffff
part_filename.selected.bold=true
[viewer]
+*.default=true
+*.normal=true
url.underline=true
header.bold=true
signature.dim=true
diff --git a/stylesets/pink b/stylesets/pink
index dfc53b71..87428874 100644
--- a/stylesets/pink
+++ b/stylesets/pink
@@ -57,6 +57,8 @@ default.selected.bg=#de4e85
completion_default.selected.bg=#de4e85
[viewer]
+*.default=true
+*.normal=true
url.fg=#ffffaf
url.underline=true
header.fg=#af87ff
diff --git a/stylesets/solarized b/stylesets/solarized
index 9874e2d8..29717c72 100644
--- a/stylesets/solarized
+++ b/stylesets/solarized
@@ -1,3 +1,4 @@
+# vim: ft=dosini
#
# aerc solarized styleset
#
@@ -37,6 +38,8 @@ part_mimetype.fg=#b58900
part_filename.selected.bold=true
[viewer]
+*.default=true
+*.normal=true
diff_add.fg=#859900 # green
diff_chunk.dim=true
diff_chunk.fg=#2aa198 # cyan