From b72d9af52c61e0242781aff4eea664d5c2687759 Mon Sep 17 00:00:00 2001 From: Benno Schulenberg Date: Tue, 2 Mar 2021 19:31:28 +0100 Subject: [PATCH] bump version numbers and add a news item for the 5.6.1 release --- ChangeLog | 10 ++++++++++ NEWS | 4 ++++ configure.ac | 2 +- doc/faq.html | 2 +- doc/nano.1 | 2 +- doc/nano.texi | 8 ++++---- doc/nanorc.5 | 2 +- doc/rnano.1 | 2 +- roll-a-release.sh | 2 +- 9 files changed, 24 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index c6ecb748..add0effa 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +Changes between v5.6 and v5.6.1: +-------------------------------- + +Benno Schulenberg (4): + bump version numbers and add a news item for the 5.6.1 release + options: rename 'highlightcolor' to the more distinct 'spotlightcolor' + search: correctly colorize a match also when softwrapping is active + tweaks: rename a symbol, to better match the corresponding option + + Changes between v5.5 and v5.6: ------------------------------ diff --git a/NEWS b/NEWS index cf4cc049..18891c15 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,7 @@ +2021.03.03 - GNU nano 5.6.1 "Geelgors" +• Search matches are properly colorized in softwrap mode too. +• Option 'highlightcolor' has been renamed to 'spotlightcolor'. + 2021.02.24 - GNU nano 5.6 "Wielewaal" • A search match gets highlighted (in black on yellow by default), in addition to placing the cursor at the start of the match. diff --git a/configure.ac b/configure.ac index 50440ef8..4ddac8e1 100644 --- a/configure.ac +++ b/configure.ac @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see https://www.gnu.org/licenses/. -AC_INIT([GNU nano], [5.6], [nano-devel@gnu.org], [nano]) +AC_INIT([GNU nano], [5.6.1], [nano-devel@gnu.org], [nano]) AC_CONFIG_SRCDIR([src/nano.c]) AC_CANONICAL_HOST AM_INIT_AUTOMAKE([1.14]) diff --git a/doc/faq.html b/doc/faq.html index 8ecfeb24..911d002e 100644 --- a/doc/faq.html +++ b/doc/faq.html @@ -89,7 +89,7 @@

1.3. Why the name change from TIP?

On January 10, 2000, TIP was officially renamed to nano because of a namespace conflict with another program called 'tip'. The original 'tip' program "establishes a full duplex terminal connection to a remote host", and was included with many older Unix systems (and newer ones like Solaris). The conflict was not noticed at first because there is no 'tip' utility included with most GNU/Linux distributions (where nano was developed).

1.4. What is the current version of nano?

-

The current version of nano should be 5.6. Of course, you should always check the nano homepage to see what the latest and greatest version is.

+

The current version of nano should be 5.6.1. Of course, you should always check the nano homepage to see what the latest and greatest version is.

1.5. I want to read the man page without having to download the program!

Jeez, demanding, aren't we? Okay, look here.

diff --git a/doc/nano.1 b/doc/nano.1 index 64bc6364..4b0d87c6 100644 --- a/doc/nano.1 +++ b/doc/nano.1 @@ -16,7 +16,7 @@ .\" Documentation License along with this program. If not, see .\" . .\" -.TH NANO 1 "version 5.6" "February 2021" +.TH NANO 1 "version 5.6.1" "March 2021" .SH NAME nano \- Nano's ANOther editor, inspired by Pico diff --git a/doc/nano.texi b/doc/nano.texi index 841945ff..441c019a 100644 --- a/doc/nano.texi +++ b/doc/nano.texi @@ -8,8 +8,8 @@ @smallbook @set EDITION 0.5 -@set VERSION 5.6 -@set UPDATED February 2021 +@set VERSION 5.6.1 +@set UPDATED March 2021 @dircategory Editors @direntry @@ -23,7 +23,7 @@ @titlepage @title GNU @command{nano} @subtitle a small and friendly text editor -@subtitle version 5.6 +@subtitle version 5.6.1 @author Chris Allegretta @page @@ -63,7 +63,7 @@ e-mail: @email{chrisa@@asty.org}@* @node Top @top -This manual documents the GNU @command{nano} editor, version 5.6. +This manual documents the GNU @command{nano} editor, version 5.6.1. @menu * Introduction:: diff --git a/doc/nanorc.5 b/doc/nanorc.5 index e5a49683..75dda577 100644 --- a/doc/nanorc.5 +++ b/doc/nanorc.5 @@ -16,7 +16,7 @@ .\" Documentation License along with this program. If not, see .\" . .\" -.TH NANORC 5 "version 5.6" "February 2021" +.TH NANORC 5 "version 5.6.1" "March 2021" .SH NAME nanorc \- GNU nano's configuration file diff --git a/doc/rnano.1 b/doc/rnano.1 index d9e68533..c447be5b 100644 --- a/doc/rnano.1 +++ b/doc/rnano.1 @@ -16,7 +16,7 @@ .\" Documentation License along with this program. If not, see .\" . .\" -.TH RNANO 1 "version 5.6" "February 2021" +.TH RNANO 1 "version 5.6.1" "March 2021" .SH NAME rnano \- a restricted nano diff --git a/roll-a-release.sh b/roll-a-release.sh index f9923994..2d47ea55 100755 --- a/roll-a-release.sh +++ b/roll-a-release.sh @@ -1,6 +1,6 @@ #!/bin/bash -VERSION="5.6" +VERSION="5.6.1" ./configure -C --enable-tiny && make && ./configure -C &&