From 3703305c06d9d9fc01a9af866035cb0f314c8c2b Mon Sep 17 00:00:00 2001
From: Evan Teran <evan.teran@gmail.com>
Date: Fri, 10 Jan 2025 22:24:14 -0500
Subject: [PATCH] some minor tweaks in prep for 2025.1 release (#362)

---
 CMakeLists.txt                 | 2 +-
 Util/include/Util/version.h.in | 2 +-
 cspell.config.yaml             | 2 ++
 docs/mkdocs.yml                | 2 +-
 src/Tags.cpp                   | 8 ++++----
 5 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 964c58274..016902024 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.15)
 
 project(nedit-ng
 	LANGUAGES CXX
-	VERSION 2020.1)
+	VERSION 2025.1)
 
 enable_testing()
 
diff --git a/Util/include/Util/version.h.in b/Util/include/Util/version.h.in
index 9c6feb055..ab26bdb05 100644
--- a/Util/include/Util/version.h.in
+++ b/Util/include/Util/version.h.in
@@ -2,7 +2,7 @@
 #ifndef VERSION_H_
 #define VERSION_H_
 
-constexpr auto NEDIT_VERSION_MAJ = 2020;
+constexpr auto NEDIT_VERSION_MAJ = 2025;
 constexpr auto NEDIT_VERSION_REV = 1;
 constexpr auto NEDIT_VERSION     = (NEDIT_VERSION_MAJ * 1000 + NEDIT_VERSION_REV);
 
diff --git a/cspell.config.yaml b/cspell.config.yaml
index 8f1e62922..3fb1c4fed 100644
--- a/cspell.config.yaml
+++ b/cspell.config.yaml
@@ -22,6 +22,8 @@ words:
   - Greef
   - konsole
   - Markus
+  - metacharacter
+  - metacharacters
   - nedit
   - overtype
   - pixmap
diff --git a/docs/mkdocs.yml b/docs/mkdocs.yml
index f3763a37e..109dc4248 100644
--- a/docs/mkdocs.yml
+++ b/docs/mkdocs.yml
@@ -6,7 +6,7 @@ extra_css:
     - css/extra.css
     - css/version-select.css
 extra:
-      version: 2020.1
+      version: 2025.1
 nav:
     - Welcome: index.md
     - Getting Started: 01.md
diff --git a/src/Tags.cpp b/src/Tags.cpp
index 113160d83..06b5d450b 100644
--- a/src/Tags.cpp
+++ b/src/Tags.cpp
@@ -846,9 +846,9 @@ bool addRelTagsFile(const QString &tagSpec, const QString &windowPath, SearchMod
 
 		QString pathName;
 		if (!windowPath.isEmpty()) {
-			pathName = tr("%1/%2").arg(windowPath, filename);
+			pathName = QStringLiteral("%1/%2").arg(windowPath, filename);
 		} else {
-			pathName = tr("%1/%2").arg(QDir::currentPath(), filename);
+			pathName = QStringLiteral("%1/%2").arg(QDir::currentPath(), filename);
 		}
 
 		pathName = NormalizePathname(pathName);
@@ -916,7 +916,7 @@ bool addTagsFile(const QString &tagSpec, SearchMode mode) {
 
 		QString pathName;
 		if (!QFileInfo(filename).isAbsolute()) {
-			pathName = tr("%1/%2").arg(QDir::currentPath(), filename);
+			pathName = QStringLiteral("%1/%2").arg(QDir::currentPath(), filename);
 		} else {
 			pathName = filename;
 		}
@@ -989,7 +989,7 @@ bool deleteTagsFile(const QString &tagSpec, SearchMode mode, bool force_unload)
 
 		QString pathName;
 		if (!QFileInfo(filename).isAbsolute()) {
-			pathName = tr("%1/%2").arg(QDir::currentPath(), filename);
+			pathName = QStringLiteral("%1/%2").arg(QDir::currentPath(), filename);
 		} else {
 			pathName = filename;
 		}