From 72ee94ed6ef9ffe09f2b9cda215479e6c703c432 Mon Sep 17 00:00:00 2001
From: NRK <nrk@disroot.org>
Date: Wed, 24 Apr 2024 06:16:00 +0000
Subject: [PATCH 1/2] clarify au and du in manpage

Closes: https://github.com/jarun/nnn/issues/1855
Closes: https://github.com/jarun/nnn/issues/1290
Closes: https://github.com/jarun/nnn/discussions/1750
---
 nnn.1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nnn.1 b/nnn.1
index d4a06044..4a42da0a 100644
--- a/nnn.1
+++ b/nnn.1
@@ -148,7 +148,7 @@ supports the following options:
 .Pp
 .Fl "T key"
         sort order
-        keys: 'a'u / 'd'u / 'e'xtension / 'r'everse / 's'ize / 't'ime / 'v'ersion
+        keys: 'a'pparent disk usage / 'd'isk usage / 'e'xtension / 'r'everse / 's'ize / 't'ime / 'v'ersion
         capitalize to reverse (except 'r')
 .Pp
 .Fl u

From e60be2eaa247f2618f94c8be2769f302780f7092 Mon Sep 17 00:00:00 2001
From: NRK <nrk@disroot.org>
Date: Wed, 24 Apr 2024 06:48:37 +0000
Subject: [PATCH 2/2] silence new clang-tidy warnings

---
 src/.clang-tidy | 3 +++
 src/nnn.c       | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/.clang-tidy b/src/.clang-tidy
index 6772ddbc..f75a0ea8 100644
--- a/src/.clang-tidy
+++ b/src/.clang-tidy
@@ -22,10 +22,13 @@ Checks: >
     -readability-identifier-length,
     -readability-isolate-declaration,
     -readability-suspicious-call-argument,
+    -readability-avoid-nested-conditional-operator,
     -bugprone-easily-swappable-parameters,
     -bugprone-narrowing-conversions,
     -bugprone-reserved-identifier,
     -bugprone-switch-missing-default-case,
+    -bugprone-inc-dec-in-conditions,
+    -bugprone-multi-level-implicit-pointer-conversion
 
 WarningsAsErrors: '*'
 HeaderFilterRegex: '.*(?<!lookup3.c)$'
diff --git a/src/nnn.c b/src/nnn.c
index 0fb74833..f3cbefdf 100644
--- a/src/nnn.c
+++ b/src/nnn.c
@@ -925,7 +925,7 @@ static bool test_set_bit(uint_t nr)
 	nr &= HASH_BITS;
 
 	pthread_mutex_lock(&hardlink_mutex);
-	ullong_t *m = ((ullong_t *)ihashbmp) + (nr >> 6);
+	ullong_t *m = ihashbmp + (nr >> 6);
 
 	if (*m & (1 << (nr & 63))) {
 		pthread_mutex_unlock(&hardlink_mutex);