From 60bd8df3c2810a08b2f7c74dee5738b2e3502e63 Mon Sep 17 00:00:00 2001 From: Frank LENORMAND Date: Fri, 20 Jul 2018 13:49:36 +0300 Subject: [PATCH 1/2] src: Don't print a number for the development version --- src/main.cc | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/main.cc b/src/main.cc index a1cfbafdc..064d2e77b 100644 --- a/src/main.cc +++ b/src/main.cc @@ -40,10 +40,10 @@ namespace Kakoune extern const char* version; struct { - int version; + unsigned int version; const char* notes; } constexpr version_notes[] = { { - 99999999, + 0, "• Big breaking refactoring of various Kakoune features,\n" " configuration might need to be updated see `:doc changelog` for details\n" "• define-command -allow-override switch has been renamed -override\n" @@ -66,7 +66,9 @@ void show_startup_info(Client* local_client, int last_version) String info; for (auto note : version_notes) { - if (note.version > last_version) + if (not note.version) + info += format("● Development version\n{}\n", note.notes); + else if (note.version > last_version) { const auto year = note.version / 10000; const auto month = (note.version / 100) % 100; From a2f9c68a7c1306da127d81bd8aa429513ce9f47d Mon Sep 17 00:00:00 2001 From: Frank LENORMAND Date: Fri, 20 Jul 2018 13:55:16 +0300 Subject: [PATCH 2/2] src: Change the bullet point symbols in the version notes --- src/main.cc | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/src/main.cc b/src/main.cc index 064d2e77b..15a3a1bfc 100644 --- a/src/main.cc +++ b/src/main.cc @@ -44,21 +44,21 @@ struct { const char* notes; } constexpr version_notes[] = { { 0, - "• Big breaking refactoring of various Kakoune features,\n" + "» Big breaking refactoring of various Kakoune features,\n" " configuration might need to be updated see `:doc changelog` for details\n" - "• define-command -allow-override switch has been renamed -override\n" + "» define-command -allow-override switch has been renamed -override\n" }, { 20180413, - "• ModeChange hook has been introduced and is expected to replace\n" + "» ModeChange hook has been introduced and is expected to replace\n" " the various ${MODE}Begin/${MODE}End hooks, consider those deprecated.\n" - "• '*' Does not strip whitespaces anymore, use built-in '_' to strip them\n" - "• 'l' on eol will go to next line, 'h' on first char will go to previous\n" - "• selections merging behaviour is now a bit more complex again\n" - "• 'x' will only jump to next line if full line is already selected\n" - "• WORD text object moved to instead of W for consistency\n" - "• rotate main selection moved to ), rotate content to , ( for backward\n" - "• faces are now scoped, set-face command takes an additional scope parameter\n" - "• key is gone, use instead\n" + "» '*' Does not strip whitespaces anymore, use built-in '_' to strip them\n" + "» 'l' on eol will go to next line, 'h' on first char will go to previous\n" + "» selections merging behaviour is now a bit more complex again\n" + "» 'x' will only jump to next line if full line is already selected\n" + "» WORD text object moved to instead of W for consistency\n" + "» rotate main selection moved to ), rotate content to , ( for backward\n" + "» faces are now scoped, set-face command takes an additional scope parameter\n" + "» key is gone, use instead\n" } }; void show_startup_info(Client* local_client, int last_version) @@ -67,13 +67,13 @@ void show_startup_info(Client* local_client, int last_version) for (auto note : version_notes) { if (not note.version) - info += format("● Development version\n{}\n", note.notes); + info += format("• Development version\n{}\n", note.notes); else if (note.version > last_version) { const auto year = note.version / 10000; const auto month = (note.version / 100) % 100; const auto day = note.version % 100; - info += format("● Kakoune v{}.{}{}.{}{}\n{}\n", + info += format("• Kakoune v{}.{}{}.{}{}\n{}\n", year, month < 10 ? "0" : "", month, day < 10 ? "0" : "", day, note.notes); } }