From 50d116dcb9183047899d93095117632c669d5f03 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ekl=C3=B6f?= <daniel@ekloef.se>
Date: Sun, 26 Jul 2020 11:39:02 +0200
Subject: [PATCH] config: scrollback-indicator-format: percent -> percentage

---
 config.c       | 14 ++++++++------
 config.h       |  2 +-
 doc/foot.5.scd |  4 ++--
 footrc         |  2 +-
 render.c       |  2 +-
 5 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/config.c b/config.c
index f87eb67f..2b989d62 100644
--- a/config.c
+++ b/config.c
@@ -307,11 +307,13 @@ parse_section_main(const char *key, const char *value, struct config *conf,
     }
 
     else if (strcmp(key, "scrollback-indicator-format") == 0) {
-        if (strcmp(value, "percent") == 0)
-            conf->scrollback.indicator.format = SCROLLBACK_INDICATOR_FORMAT_PERCENT;
-        else if (strcmp(value, "line") == 0)
-            conf->scrollback.indicator.format = SCROLLBACK_INDICATOR_FORMAT_LINENO;
-        else {
+        if (strcmp(value, "percent") == 0) {
+            conf->scrollback.indicator.format
+                = SCROLLBACK_INDICATOR_FORMAT_PERCENTAGE;
+        } else if (strcmp(value, "line") == 0) {
+            conf->scrollback.indicator.format
+                = SCROLLBACK_INDICATOR_FORMAT_LINENO;
+        } else {
             LOG_ERR("%s:%d: 'scrollback-indicator-format must be one "
                     "of 'percent' or 'line'",
                     path, lineno);
@@ -949,7 +951,7 @@ config_load(struct config *conf, const char *conf_path)
             .lines = 1000,
             .indicator = {
                 .style = SCROLLBACK_INDICATOR_STYLE_RELATIVE,
-                .format = SCROLLBACK_INDICATOR_FORMAT_PERCENT,
+                .format = SCROLLBACK_INDICATOR_FORMAT_PERCENTAGE,
             },
         },
         .colors = {
diff --git a/config.h b/config.h
index 57701606..456019b5 100644
--- a/config.h
+++ b/config.h
@@ -50,7 +50,7 @@ struct config {
             } style;
 
             enum {
-                SCROLLBACK_INDICATOR_FORMAT_PERCENT,
+                SCROLLBACK_INDICATOR_FORMAT_PERCENTAGE,
                 SCROLLBACK_INDICATOR_FORMAT_LINENO
             } format;
         } indicator;
diff --git a/doc/foot.5.scd b/doc/foot.5.scd
index 573eb313..c348391b 100644
--- a/doc/foot.5.scd
+++ b/doc/foot.5.scd
@@ -78,8 +78,8 @@ in this order:
 
 *scrollback-indicator-format*
 	Which format to use when displaying the scrollback position
-	indicator. Either _percent_ or _line_. This option is ignored if
-	*scrollback-indicator-style=none*. Default: _percent_.
+	indicator. Either _percentage_ or _line_. This option is ignored
+	if *scrollback-indicator-style=none*. Default: _percentage_.
 
 *workers*
 	Number of threads to use for rendering. Set to 0 to disable
diff --git a/footrc b/footrc
index c2ee52e7..3ab2e6c1 100644
--- a/footrc
+++ b/footrc
@@ -3,7 +3,7 @@
 # font=monospace
 # scrollback=1000
 # scrollback-indicator-style=relative
-# scrollback-indicator-format=percent
+# scrollback-indicator-format=percentage
 # geometry=700x500
 # pad=2x2
 # initial-window-mode=windowed
diff --git a/render.c b/render.c
index 55213408..6e8a56d4 100644
--- a/render.c
+++ b/render.c
@@ -1363,7 +1363,7 @@ render_scrollback_position(struct terminal *term)
 
     /* *What* to render */
     switch (term->conf->scrollback.indicator.format) {
-    case SCROLLBACK_INDICATOR_FORMAT_PERCENT:
+    case SCROLLBACK_INDICATOR_FORMAT_PERCENTAGE:
         swprintf(text, sizeof(text) / sizeof(text[0]), L"%u%%", percent);
         cell_count = 3;
         break;