new upstream release - 3.1

This commit is contained in:
Kamil Dudka 2018-09-19 09:53:51 +02:00
parent 313f3bcbce
commit 56ef782921
5 changed files with 22 additions and 71 deletions

View File

@ -1,49 +0,0 @@
From 027140f9b5b7db5c0832363034dd159b34eb3a03 Mon Sep 17 00:00:00 2001
From: Benno Schulenberg <bensberg@telfort.nl>
Date: Wed, 12 Sep 2018 13:18:17 +0200
Subject: [PATCH] bindings: when Ctrl+Shift+Delete has no keycode, don't use
KEY_BSP
When curses gives no code for Ctrl+Shift+Delete, do not fall back
to KEY_BACKSPACE, because then ^H and/or <Backspace> get bound to
'cutwordleft'.
This fixes https://savannah.gnu.org/bugs/?54642.
Bug was introduced with version 3.0, commit e6429e78.
Upstream-commit: 09ab2e3d0eeb33bc4d0702623404ba01b1f8fa9a
Signed-off-by: Kamil Dudka <kdudka@redhat.com>
---
src/nano.c | 2 +-
src/nano.h | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/nano.c b/src/nano.c
index c7e0ca2d..74e12439 100644
--- a/src/nano.c
+++ b/src/nano.c
@@ -2580,7 +2580,7 @@ int main(int argc, char **argv)
controlhome = get_keycode("kHOM5", CONTROL_HOME);
controlend = get_keycode("kEND5", CONTROL_END);
controldelete = get_keycode("kDC5", CONTROL_DELETE);
- controlshiftdelete = get_keycode("kDC6", KEY_BACKSPACE);
+ controlshiftdelete = get_keycode("kDC6", CONTROL_SHIFT_DELETE);
#ifndef NANO_TINY
/* Ask for the codes for Shift+Control+Left/Right/Up/Down. */
shiftcontrolleft = get_keycode("kLFT6", SHIFT_CONTROL_LEFT);
diff --git a/src/nano.h b/src/nano.h
index e1042759..7de34bf3 100644
--- a/src/nano.h
+++ b/src/nano.h
@@ -588,6 +588,7 @@ enum
#define SHIFT_CONTROL_DOWN 0x414
#define SHIFT_CONTROL_HOME 0x415
#define SHIFT_CONTROL_END 0x416
+#define CONTROL_SHIFT_DELETE 0x417
#define ALT_LEFT 0x421
#define ALT_RIGHT 0x422
#define ALT_UP 0x423
--
2.17.1

View File

@ -1,16 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEEv9AJBh5TUFKtDfIVDSjU0qCs6IQFAluU7QUACgkQDSjU0qCs
6ISqVA/9H4B6mAZc9AZZCl2uQUX5/cLcEXPVbP38qCmtbZIg+JKa7rmeqpA/NZF+
SIEZUb2yQK2gtgPag7JZyqVytzfBaUF/YqVKpqmwO/LDydMipQIJ4NHOZe9fzBSv
wo3u0mow0O+sPDlF3pw6psMmLmMRFj+6A8WpY72NbQy5G2XdSSP5kyF2j+lX5CCg
5rkjquT49sYKTXSKsTTq1m0hpd5exVt+wt3jMX5DD8+Ih/Woks/2RtV0jj2FbF/f
E5KtF39RPQvHYbi9GJck5bTKCyxoHXw6RSC6qtRB/QyJsVbAZwyBoVF5ZT51Hb6V
fngcTq2HI/GlQXWo2JTleaaGHhBh1Hk057rrt4WKCdTk/iIXcpjP4uLlu3KByNYw
FJC6SuhQ2BOjaANtERMPMrhxvEK8mRo/+z1tXld7DI4UiOxBqhWv7MnDUndyvXTb
B0H6ANLM8YXLorLdE9Wxr5T+35afljEUwVWa1DH7yiyWxTbyF2blYfDiJOM8rPEe
3iC092jgeLU43VUNTGZEEHUvTq5bx0Kta5XbV3APo27OHg90cJdDKWqsqwLPGh1r
oDKTdfC/YYm6JTZcI84P3DBuYnA18SHKy/N90fIKSbS2dlFj6Vun0KefYza0Vzw0
QLbCzzBWw35+YUm8zW2lrEeQSdXVentU5Akwsj+wjTAPYkx9JE4=
=6daF
-----END PGP SIGNATURE-----

16
nano-3.1.tar.xz.asc Normal file
View File

@ -0,0 +1,16 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEEv9AJBh5TUFKtDfIVDSjU0qCs6IQFAluhOEkACgkQDSjU0qCs
6ISujg//flQgQZHM5H+jogZPG03kmCra9yZ6Z9eLDrpdAssu/4EwLypGPz1xw2jS
ZQ+f4hBNvEnl7lPKS/8uRISSwzOCcLmM9QaaiAOAwvaJCgPx9J85gR5VqVJ/4ep1
ndwHGdZnvufG3kpXwi8HQG107FSlbyBeN5cnAKbVG9B7J5gROsS9ZudWbhQjrNeP
VkK3aEea3qPhj7tBG3Rds4jlab9V8aYfIuTTyZwTYASlz4pjRBZmwc2rkjqSi1j7
75A69Z1eNSt4fUqNGsvCD3NKrkNxbvGStWaBICiT8BwBnrK8LeUyIRbGmICUawQ7
hvCGe/PaZ0UKfoYa0Xyn+l+x7vu7hgPJW8TVsLBVWnykIuNbd/bcwfWJAgVtcskU
opE2YdCKJaIDRy8ONtlDmaL2M+vBk0pqFyPCtsWMyc4Vaqon7L9n6iip2unBAzXR
OUnCk246UvCTxdLFxEdYRJ2+YhNBj4tsrDdOIps5AVV6LlfPrVgpHHMo4gdVkp4W
Z5iMVAWCzC9cjTD1gxwsx4GFPHc0us3A/vgwSi7AU4stoOu7LRAUrKySpEbd1woB
zRIR/dx0XWrrrD1VEDCl/dZGouK7Tpske/q4AbpA/QE+QX6bXvpJYkg9LEcZscb5
EyYxDF7GBuCBoZyXzIpcp878siwDSksq8SyoZXpXt0n6CLh0EuA=
=FlXc
-----END PGP SIGNATURE-----

View File

@ -1,7 +1,7 @@
Summary: A small text editor
Name: nano
Version: 3.0
Release: 2%{?dist}
Version: 3.1
Release: 1%{?dist}
License: GPLv3+
URL: https://www.nano-editor.org
Source: https://www.nano-editor.org/dist/latest/%{name}-%{version}.tar.xz
@ -19,9 +19,6 @@ Conflicts: filesystem < 3
Requires(post): /sbin/install-info
Requires(preun): /sbin/install-info
# when Ctrl+Shift+Delete has no key code, do not fall back to KEY_BACKSPACE
Patch1: 0001-nano-3.0-key-bsp.patch
%description
GNU nano is a small and friendly text editor.
@ -83,6 +80,9 @@ exit 0
%{_datadir}/nano
%changelog
* Wed Sep 19 2018 Kamil Dudka <kdudka@redhat.com> - 3.1-1
- new upstream release
* Fri Sep 14 2018 Kamil Dudka <kdudka@redhat.com> - 3.0-2
- when Ctrl+Shift+Delete has no key code, do not fall back to KEY_BACKSPACE

View File

@ -1 +1 @@
SHA512 (nano-3.0.tar.xz) = 120b606d65672a905e9ef9f3b55381cc62b7929abeaf409ea4af6be9f51b3d038e6e68f082755cbb7e198f0fb5203e0f4796c6c96ebd054d9a2241b313fcdda1
SHA512 (nano-3.1.tar.xz) = dc50381a129fec32d85982d8129324268e3e27a28c5b958fb7bcfca690646bd0a3b995dc456971355b91952c0ac3ea3e0a873b228010238a76e8dbb0ddaf1143