CHANGELOG | 45 +++++++++++++++++++++++++++++++++++++++++++++
README.md | 3 +--
nnn.1 | 2 +-
src/nnn.c | 18 ++++++++----------
diff --git a/CHANGELOG b/CHANGELOG
index 811c4eb6e71bcc3c2bd09aff5ba6f74191b3aa76..7619d2eaa3a14c9193060c4c62b259db911d3e09 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,48 @@
+nnn v3.1
+2020-04-13
+
+- unlimited bookmarks and plugin keys
+- status bar text in context color
+- support config `NO_COLOR` to disable colors
+- config `NNN_OPTS` to specify binary options to `nnn`
+- config `NNN_MCLICK` to emulate configurable key
+- toggle selection on right click
+- ignore hard links when calculating disk usage
+- dim (hard/sym) link names (symlink to file has `@`)
+- more special keys at empty filter prompt in _type-to-nav_
+- key > to export file list
+- option `-F` to show fortune in help and settings screen
+- option `-T` to specify sort order (obsoletes `-v`)
+- option to clear sort order
+- key T to change time type (access/change/mod)
+- `.nmv` - internal fully-functional batch renamer plugin
+- make var `O_NOBATCH` to disable native batch renamer
+- `nuke` & `imgview` - open all images in directory sxiv
+- `nuke` - open log files in vi
+- plugin `x2sel` - system clipboard to selection copier
+- plugin `fzy` - cd using z database
+- plugin `fzopen` - support `FZF_DEFAULT_COMMAND`
+- create new context on TAB without prompt
+- hover and connect by dir name (within config dir)
+- move to next entry on current file delete
+- on single file copy/move, select the copied/moved file
+- option `-f` to to use readline history file (off by default)
+- use `s` in status bar to indicate selection in progress
+- make var `O_NOMOUSE` to disable mouse support
+- do not store `NNN_TRASH` and `-Q` in config/session
+- add sample .desktop file for XDG compatible DEs
+- rename _nav-as-you-type_ to _type-to-nav_ mode
+- fix PCRE case-insensitive regex search
+- fix no error msg when filter length limit exceeded
+- fix static package generation
+- fix broken abort message when started in du-mode
+- fix filter lost on context switch in non _type-to-nav_ mode
+- fix broken readline prompt
+- fix long strings treated as action keys in filter prompt
+- fix `NNNLVL` not reset when spawned shell is exited
+
+-------------------------------------------------------------------------------
+
nnn v3.0
2020-02-12
diff --git a/README.md b/README.md
index e3301c20da58fe205cd86c5ce371ad5097204820..0f17a7eb84962cb20527af34f0c78e5c28227bfa 100644
--- a/README.md
+++ b/README.md
@@ -7,7 +7,6 @@ 
-
@@ -51,7 +50,7 @@ 24. Compile out features you don't need
25. Watch matrix text fly or read fortune messages
26. Configure in 5 minutes!
-Once installed (instructions below), _**read the fine [manual](https://github.com/jarun/nnn/wiki)**_.
+Once installed (instructions below), _**read the fine manual**_. [](https://github.com/jarun/nnn/wiki)
## Features
diff --git a/nnn.1 b/nnn.1
index cc74b0e017b9e53b739cb9c262ca37920a5f8078..6b5ff0a5c27028fef57f40c83e4e2787fe8a724b 100644
--- a/nnn.1
+++ b/nnn.1
@@ -1,4 +1,4 @@
-.Dd Feb 12, 2020
+.Dd Apr 13, 2020
.Dt NNN 1
.Os
.Sh NAME
diff --git a/src/nnn.c b/src/nnn.c
index b9cc70c27f8399148cbd3c1ebcf6104f41297532..8f21134dbab7f3b2e8112127ba78ac186ca20cff 100644
--- a/src/nnn.c
+++ b/src/nnn.c
@@ -107,7 +107,7 @@ #include "nnn.h"
#include "dbg.h"
/* Macro definitions */
-#define VERSION "3.0"
+#define VERSION "3.1"
#define GENERAL_INFO "BSD 2-Clause\nhttps://github.com/jarun/nnn"
#define SESSIONS_VERSION 1
@@ -770,7 +770,7 @@
static void clearinfoln(void)
{
move(xlines - 2, 0);
- addch('\n');
+ clrtoeol();
}
#ifdef KEY_RESIZE
@@ -817,12 +817,6 @@ if (!cfg.picker && selpath)
unlink(selpath);
free(pselbuf);
exit(1);
-}
-
-static void printinfoln(const char *str)
-{
- clearinfoln();
- mvaddstr(xlines - 2, xcols - strlen(str), str);
}
static inline bool xconfirm(int c)
@@ -936,7 +930,7 @@ * Just a safe strncpy(3)
* Always null ('\0') terminates if both src and dest are valid pointers.
* Returns the number of bytes copied including terminating null byte.
*/
-static size_t xstrsncpy(char *restrict dest, const char *restrict src, size_t n)
+static size_t xstrsncpy(char *dest, const char *src, size_t n)
{
if (!src || !dest || !n)
return 0;
@@ -2390,13 +2384,17 @@
snprintf(info + i, REGEX_MAX - i - 1, " %s [/], %s [:]",
(cfg.regex ? "regex" : "str"),
((fnstrstr == &strcasestr) ? "ic" : "noic"));
- printinfoln(info);
+
+ clearinfoln();
+ mvaddstr(xlines - 2, xcols - strlen(info), info);
}
static void showfilter(char *str)
{
+ attron(COLOR_PAIR(cfg.curctx + 1));
showfilterinfo();
printmsg(str);
+ // printmsg calls attroff()
}
static inline void swap_ent(int id1, int id2)