annotate src/readline-0-007-display-newline-if-readline-is-.patch @ 7207:9ed6500e56d3 default tip @

maint: Merge release to default.
author Markus Mützel <markus.muetzel@gmx.de>
date Fri, 17 May 2024 20:16:41 +0200
parents 142471155843
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
6989
5f2c92da4d9c readline: update to 8.1 patch level 7
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
1 From bfe9c573a9e376323929c80b2b71c59727fab0cc Mon Sep 17 00:00:00 2001
5f2c92da4d9c readline: update to 8.1 patch level 7
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
2 From: Chet Ramey <chet.ramey@case.edu>
5f2c92da4d9c readline: update to 8.1 patch level 7
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
3 Date: Fri, 17 Nov 2023 16:06:49 -0500
7042
142471155843 readline: update to 8.2 patch level 10
Markus Mützel <markus.muetzel@gmx.de>
parents: 6989
diff changeset
4 Subject: [PATCH 07/10] Readline-8.2 patch 7: display newline if readline is
6989
5f2c92da4d9c readline: update to 8.1 patch level 7
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
5 called without a prompt string and return is typed on a single empty line
5f2c92da4d9c readline: update to 8.1 patch level 7
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
6
5f2c92da4d9c readline: update to 8.1 patch level 7
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
7 ---
5f2c92da4d9c readline: update to 8.1 patch level 7
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
8 display.c | 4 ++--
5f2c92da4d9c readline: update to 8.1 patch level 7
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
9 patchlevel | 2 +-
5f2c92da4d9c readline: update to 8.1 patch level 7
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
10 2 files changed, 3 insertions(+), 3 deletions(-)
5f2c92da4d9c readline: update to 8.1 patch level 7
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
11
5f2c92da4d9c readline: update to 8.1 patch level 7
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
12 diff --git a/display.c b/display.c
5f2c92da4d9c readline: update to 8.1 patch level 7
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
13 index ad573f9..803d4ce 100644
5f2c92da4d9c readline: update to 8.1 patch level 7
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
14 --- a/display.c
5f2c92da4d9c readline: update to 8.1 patch level 7
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
15 +++ b/display.c
5f2c92da4d9c readline: update to 8.1 patch level 7
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
16 @@ -3338,9 +3338,9 @@ _rl_update_final (void)
5f2c92da4d9c readline: update to 8.1 patch level 7
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
17 puts_face (&last_line[_rl_screenwidth - 1 + woff],
5f2c92da4d9c readline: update to 8.1 patch level 7
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
18 &last_face[_rl_screenwidth - 1 + woff], 1);
5f2c92da4d9c readline: update to 8.1 patch level 7
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
19 }
5f2c92da4d9c readline: update to 8.1 patch level 7
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
20 - _rl_vis_botlin = 0;
5f2c92da4d9c readline: update to 8.1 patch level 7
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
21 - if (botline_length > 0 || _rl_last_c_pos > 0)
5f2c92da4d9c readline: update to 8.1 patch level 7
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
22 + if ((_rl_vis_botlin == 0 && botline_length == 0) || botline_length > 0 || _rl_last_c_pos > 0)
5f2c92da4d9c readline: update to 8.1 patch level 7
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
23 rl_crlf ();
5f2c92da4d9c readline: update to 8.1 patch level 7
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
24 + _rl_vis_botlin = 0;
5f2c92da4d9c readline: update to 8.1 patch level 7
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
25 fflush (rl_outstream);
5f2c92da4d9c readline: update to 8.1 patch level 7
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
26 rl_display_fixed++;
5f2c92da4d9c readline: update to 8.1 patch level 7
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
27 }
5f2c92da4d9c readline: update to 8.1 patch level 7
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
28 diff --git a/patchlevel b/patchlevel
5f2c92da4d9c readline: update to 8.1 patch level 7
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
29 index 6ebd6a5..e340b58 100644
5f2c92da4d9c readline: update to 8.1 patch level 7
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
30 --- a/patchlevel
5f2c92da4d9c readline: update to 8.1 patch level 7
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
31 +++ b/patchlevel
5f2c92da4d9c readline: update to 8.1 patch level 7
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
32 @@ -1,3 +1,3 @@
5f2c92da4d9c readline: update to 8.1 patch level 7
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
33 # Do not edit -- exists only for use by patch
5f2c92da4d9c readline: update to 8.1 patch level 7
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
34
5f2c92da4d9c readline: update to 8.1 patch level 7
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
35 -6
5f2c92da4d9c readline: update to 8.1 patch level 7
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
36 +7
5f2c92da4d9c readline: update to 8.1 patch level 7
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
37 --
5f2c92da4d9c readline: update to 8.1 patch level 7
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
38 2.38.0.windows.1
5f2c92da4d9c readline: update to 8.1 patch level 7
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
39