nano: update to 8.1

Update nano editor to version 8.1.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
(cherry picked from commit 98f642226f)
This commit is contained in:
Hannu Nyman
2024-07-28 20:45:09 +03:00
parent 3db4314e2e
commit 5ae298212f
2 changed files with 2 additions and 29 deletions

View File

@@ -8,12 +8,12 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=nano
PKG_VERSION:=8.0
PKG_VERSION:=8.1
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=@GNU/nano
PKG_HASH:=c17f43fc0e37336b33ee50a209c701d5beb808adc2d9f089ca831b40539c9ac4
PKG_HASH:=93b3e3e9155ae389fe9ccf9cb7ab380eac29602835ba3077b22f64d0f0cbe8cb
PKG_LICENSE:=GPL-3.0-or-later
PKG_LICENSE_FILES:=COPYING

View File

@@ -1,27 +0,0 @@
From e9c7dfa99221935ffa38b5b9dbf294933e0aa7c0 Mon Sep 17 00:00:00 2001
From: Benno Schulenberg <bensberg@telfort.nl>
Date: Fri, 3 May 2024 12:12:09 +0200
Subject: minibar: do not falsely report that a new, empty file is in Mac
format
The 'openfile->fmt' element gets initialized to 'UNSPECIFIED',
so the code has to take that possibility into account.
This fixes https://savannah.gnu.org/bugs/?65676.
Bug existed since version 8.0, commit fe4f74f6.
---
src/winio.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/src/winio.c
+++ b/src/winio.c
@@ -2213,7 +2213,7 @@ void minibar(void)
size_t count = openfile->filebot->lineno - (openfile->filebot->data[0] == '\0');
number_of_lines = nmalloc(49);
- if (openfile->fmt == NIX_FILE)
+ if (openfile->fmt == NIX_FILE || openfile->fmt == UNSPECIFIED)
sprintf(number_of_lines, P_(" (%zu line)", " (%zu lines)", count), count);
else
sprintf(number_of_lines, P_(" (%zu line, %s)", " (%zu lines, %s)", count),