Mercurial > mxe-octave
annotate src/readline-0-003.patch @ 5531:eae508c12529
Add build rule for build-octave (bug #49503).
* src/build-octave.mk: Add new build rule for build-octave which can be used for
cross-building binary packages that depend on Octave as a build tool.
* dist-files.mk: Add new file to list.
* index.html: Add new package to list.
* src/of-communications.mk, src/of-image.mk, src/of-mapping.mk,
src/of-optiminterp.mk, src/of-sparsersb.mk, src/of-statistics.mk,
src/of-windows.mk: Add optional dependency on build-octave.
* configure.ac: Add new configure switch "--disable-system-octave" that is
needed to build the build-octave package.
* Makefile.in: Add variable "USE_SYSTEM_OCTAVE". Exclude build-octave from the
default build tools and build it only if a package explicitly depends on it.
Display warning about missing native Octave version only if necessary.
author | Markus Mützel <markus.muetzel@gmx.de> |
---|---|
date | Tue, 08 Sep 2020 23:04:38 +0200 |
parents | 2b13fe9f4ef9 |
children |
rev | line source |
---|---|
5475
2b13fe9f4ef9
readline: Add upstream patches.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
1 READLINE PATCH REPORT |
2b13fe9f4ef9
readline: Add upstream patches.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
2 ===================== |
2b13fe9f4ef9
readline: Add upstream patches.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
3 |
2b13fe9f4ef9
readline: Add upstream patches.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
4 Readline-Release: 8.0 |
2b13fe9f4ef9
readline: Add upstream patches.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
5 Patch-ID: readline80-003 |
2b13fe9f4ef9
readline: Add upstream patches.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
6 |
2b13fe9f4ef9
readline: Add upstream patches.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
7 Bug-Reported-by: HIROSE Masaaki <hirose31@gmail.com> |
2b13fe9f4ef9
readline: Add upstream patches.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
8 Bug-Reference-ID: <CAGSOfA-RqiTe=+GsXsDKyZrrMWH4bDbXgMVVegMa6OjqC5xbnQ@mail.gmail.com> |
2b13fe9f4ef9
readline: Add upstream patches.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
9 Bug-Reference-URL: https://lists.gnu.org/archive/html/bug-bash/2019-05/msg00038.html |
2b13fe9f4ef9
readline: Add upstream patches.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
10 |
2b13fe9f4ef9
readline: Add upstream patches.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
11 Bug-Description: |
2b13fe9f4ef9
readline: Add upstream patches.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
12 |
2b13fe9f4ef9
readline: Add upstream patches.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
13 Reading history entries with timestamps can result in history entries joined |
2b13fe9f4ef9
readline: Add upstream patches.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
14 by linefeeds. |
2b13fe9f4ef9
readline: Add upstream patches.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
15 |
2b13fe9f4ef9
readline: Add upstream patches.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
16 diff --git "a/histfile.c" "b/histfile.c" |
2b13fe9f4ef9
readline: Add upstream patches.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
17 --- a/histfile.c 2018-06-11 09:14:52.000000000 -0400 |
2b13fe9f4ef9
readline: Add upstream patches.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
18 +++ b/histfile.c 2019-05-16 15:55:57.000000000 -0400 |
2b13fe9f4ef9
readline: Add upstream patches.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
19 @@ -370,7 +370,9 @@ |
2b13fe9f4ef9
readline: Add upstream patches.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
20 |
2b13fe9f4ef9
readline: Add upstream patches.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
21 has_timestamps = HIST_TIMESTAMP_START (buffer); |
2b13fe9f4ef9
readline: Add upstream patches.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
22 - history_multiline_entries += has_timestamps && history_write_timestamps; |
2b13fe9f4ef9
readline: Add upstream patches.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
23 + history_multiline_entries += has_timestamps && history_write_timestamps; |
2b13fe9f4ef9
readline: Add upstream patches.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
24 |
2b13fe9f4ef9
readline: Add upstream patches.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
25 /* Skip lines until we are at FROM. */ |
2b13fe9f4ef9
readline: Add upstream patches.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
26 + if (has_timestamps) |
2b13fe9f4ef9
readline: Add upstream patches.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
27 + last_ts = buffer; |
2b13fe9f4ef9
readline: Add upstream patches.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
28 for (line_start = line_end = buffer; line_end < bufend && current_line < from; line_end++) |
2b13fe9f4ef9
readline: Add upstream patches.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
29 if (*line_end == '\n') |
2b13fe9f4ef9
readline: Add upstream patches.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
30 @@ -381,5 +383,16 @@ |
2b13fe9f4ef9
readline: Add upstream patches.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
31 if (HIST_TIMESTAMP_START(p) == 0) |
2b13fe9f4ef9
readline: Add upstream patches.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
32 current_line++; |
2b13fe9f4ef9
readline: Add upstream patches.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
33 + else |
2b13fe9f4ef9
readline: Add upstream patches.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
34 + last_ts = p; |
2b13fe9f4ef9
readline: Add upstream patches.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
35 line_start = p; |
2b13fe9f4ef9
readline: Add upstream patches.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
36 + /* If we are at the last line (current_line == from) but we have |
2b13fe9f4ef9
readline: Add upstream patches.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
37 + timestamps (has_timestamps), then line_start points to the |
2b13fe9f4ef9
readline: Add upstream patches.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
38 + text of the last command, and we need to skip to its end. */ |
2b13fe9f4ef9
readline: Add upstream patches.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
39 + if (current_line >= from && has_timestamps) |
2b13fe9f4ef9
readline: Add upstream patches.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
40 + { |
2b13fe9f4ef9
readline: Add upstream patches.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
41 + for (line_end = p; line_end < bufend && *line_end != '\n'; line_end++) |
2b13fe9f4ef9
readline: Add upstream patches.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
42 + ; |
2b13fe9f4ef9
readline: Add upstream patches.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
43 + line_start = (*line_end == '\n') ? line_end + 1 : line_end; |
2b13fe9f4ef9
readline: Add upstream patches.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
44 + } |
2b13fe9f4ef9
readline: Add upstream patches.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
45 } |
2b13fe9f4ef9
readline: Add upstream patches.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
46 |
2b13fe9f4ef9
readline: Add upstream patches.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
47 diff --git "a/patchlevel" "b/patchlevel" |
2b13fe9f4ef9
readline: Add upstream patches.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
48 --- a/patchlevel 2013-11-15 08:11:11.000000000 -0500 |
2b13fe9f4ef9
readline: Add upstream patches.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
49 +++ b/patchlevel 2014-03-21 08:28:40.000000000 -0400 |
2b13fe9f4ef9
readline: Add upstream patches.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
50 @@ -1,3 +1,3 @@ |
2b13fe9f4ef9
readline: Add upstream patches.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
51 # Do not edit -- exists only for use by patch |
2b13fe9f4ef9
readline: Add upstream patches.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
52 |
2b13fe9f4ef9
readline: Add upstream patches.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
53 -2 |
2b13fe9f4ef9
readline: Add upstream patches.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
54 +3 |