aboutsummaryrefslogtreecommitdiffstats
path: root/package/utils/busybox/patches/402-vi-avoid-touching-a-new-file-with-ZZ-when-no-editing.patch
diff options
context:
space:
mode:
authorMagnus Kroken <mkroken@gmail.com>2017-08-23 23:13:34 +0200
committerHans Dedecker <dedeckeh@gmail.com>2017-08-30 22:34:41 +0200
commit89f8a01daba938e77e94ef311233be49c23a7a55 (patch)
tree927ba3ca70a8549b446a565c8f20353b9866a86e /package/utils/busybox/patches/402-vi-avoid-touching-a-new-file-with-ZZ-when-no-editing.patch
parent9adfeccd8415ed7e999855539a5fca9bfc9a3e4b (diff)
downloadupstream-89f8a01daba938e77e94ef311233be49c23a7a55.tar.gz
upstream-89f8a01daba938e77e94ef311233be49c23a7a55.tar.bz2
upstream-89f8a01daba938e77e94ef311233be49c23a7a55.zip
busybox: update to 1.27.2
Refresh patches, delete patches backported from upstream. This fixes ntpd sync issues (ntpd would not sync if the first provided peer address was unreachable). Signed-off-by: Magnus Kroken <mkroken@gmail.com> Signed-off-by: Kevin Darbyshire-Bryant <kevin@darbyshire-bryant.me.uk>
Diffstat (limited to 'package/utils/busybox/patches/402-vi-avoid-touching-a-new-file-with-ZZ-when-no-editing.patch')
-rw-r--r--package/utils/busybox/patches/402-vi-avoid-touching-a-new-file-with-ZZ-when-no-editing.patch53
1 files changed, 0 insertions, 53 deletions
diff --git a/package/utils/busybox/patches/402-vi-avoid-touching-a-new-file-with-ZZ-when-no-editing.patch b/package/utils/busybox/patches/402-vi-avoid-touching-a-new-file-with-ZZ-when-no-editing.patch
deleted file mode 100644
index b56cf735c2..0000000000
--- a/package/utils/busybox/patches/402-vi-avoid-touching-a-new-file-with-ZZ-when-no-editing.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 8f3bf4f0d3605b50a8e4c48c89aeabc455f04884 Mon Sep 17 00:00:00 2001
-From: Yousong Zhou <yszhou4tech@gmail.com>
-Date: Fri, 24 Mar 2017 21:13:10 +0100
-Subject: [PATCH 2/2] vi: avoid touching a new file with ZZ when no editing has
- been done
-
-This is the behaviour observed with standard vim and busybox vi of at
-least 1.22.1. It was changed with commit "32afd3a vi: some
-simplifications" which happened before 1.23.0.
-
-Mistyping filename on command line happens fairly often and it's better
-we restore the old behaviour to avoid a few unnecessary flash writes and
-sometimes efforts of debugging bugs caused by those unneeded stray
-files.
-
-Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
-Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
----
- editors/vi.c | 16 ++++++++--------
- 1 file changed, 8 insertions(+), 8 deletions(-)
-
---- a/editors/vi.c
-+++ b/editors/vi.c
-@@ -719,14 +719,6 @@ static int init_text_buffer(char *fn)
- {
- int rc;
-
-- flush_undo_data();
-- modified_count = 0;
-- last_modified_count = -1;
--#if ENABLE_FEATURE_VI_YANKMARK
-- /* init the marks */
-- memset(mark, 0, sizeof(mark));
--#endif
--
- /* allocate/reallocate text buffer */
- free(text);
- text_size = 10240;
-@@ -741,6 +733,14 @@ static int init_text_buffer(char *fn)
- // file doesnt exist. Start empty buf with dummy line
- char_insert(text, '\n', NO_UNDO);
- }
-+
-+ flush_undo_data();
-+ modified_count = 0;
-+ last_modified_count = -1;
-+#if ENABLE_FEATURE_VI_YANKMARK
-+ /* init the marks */
-+ memset(mark, 0, sizeof(mark));
-+#endif
- return rc;
- }
-