some minor tweaks in prep for 2025.1 release (#362)

eteran · Jan 11, 2025 · 3703305 · 3703305
1 parent 8693dbf
commit 3703305
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 7 deletions.
diff --git 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
@@ -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
@@ -22,6 +22,8 @@ words:
   - Greef
   - konsole
   - Markus
+  - metacharacter
+  - metacharacters
   - nedit
   - overtype
   - pixmap

diff --git 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
@@ -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;
 		}
-Original file line number
+Diff line change
@@ Expand Up / @@ -22,6 +22,8 @@ words: @@
       - Greef
       - konsole
       - Markus
+      - metacharacter
+      - metacharacters
       - nedit
       - overtype
       - pixmap
@@ Expand Down @@