haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-22 11:40:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

nano: update gcc2 patch.

Browse Source
This commit is contained in:
Jerome Duval
2015-12-01 18:01:47 +00:00
parent 1b76d6908d
commit c62aa072d5
1 changed files with 21 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
app-editors/nano/patches/nano-2.4.3.patchset
View File

@@ -1,14 +1,14 @@
From a06032cec12b0b90ba5cd7c513ea734f072a4226 Mon Sep 17 00:00:00 2001
From b51cd55b9f592bbefccd43598651d3633826bc3f Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Mon, 23 Mar 2015 17:20:54 +0000
Subject: Haiku patch
diff --git a/src/files.c b/src/files.c
index baa10d8..7d3b93b 100644
index 84dd62c..9092c62 100644
--- a/src/files.c
+++ b/src/files.c
@@ -1200,11 +1200,11 @@ void do_insertfile(
@@ -1229,11 +1229,11 @@ void do_insertfile(
#if !defined(DISABLE_MULTIBUFFER) && !defined(DISABLE_HISTORIES)
if (ISSET(MULTIBUFFER)) {
@@ -22,7 +22,7 @@ index baa10d8..7d3b93b 100644
#ifndef NANO_TINY
!execute &&
diff --git a/src/text.c b/src/text.c
index ec0b3a5..0a817c2 100644
index 9069ab5..0ae7c04 100644
--- a/src/text.c
+++ b/src/text.c
@@ -398,11 +398,12 @@ void undo_cut(undo *u)
@@ -72,15 +72,16 @@ index ec0b3a5..0a817c2 100644
break;
case REPLACE:
undidmsg = _("text replace");
@@ -577,6 +581,7 @@ void do_undo(void)
@@ -577,6 +581,8 @@ void do_undo(void)
/* Redo the last thing(s) we undid. */
void do_redo(void)
{
+ filestruct *shoveline;
+ filestruct *f;
undo *u = openfile->undotop;
size_t len = 0;
char *data, *redidmsg = NULL;
@@ -592,7 +597,7 @@ void do_redo(void)
@@ -592,7 +598,7 @@ void do_redo(void)
return;
}
@@ -89,7 +90,16 @@ index ec0b3a5..0a817c2 100644
if (!f) {
statusbar(_("Internal error: can't match line %d. Please save your work."), u->mark_begin_lineno);
return;
@@ -1081,6 +1086,7 @@ fprintf(stderr, " >> Updating... action = %d, fs->last_action = %d, openfile->c
@@ -628,7 +634,7 @@ void do_redo(void)
break;
case ENTER:
redidmsg = _("line break");
- filestruct *shoveline = make_new_node(f);
+ shoveline = make_new_node(f);
shoveline->data = mallocstrcpy(NULL, u->strdata);
data = mallocstrncpy(NULL, f->data, u->begin + 1);
data[u->begin] = '\0';
@@ -1090,6 +1096,7 @@ fprintf(stderr, " >> Updating... action = %d, fs->last_action = %d, openfile->c
free_filestruct(u->cutbuffer);
u->cutbuffer = copy_filestruct(cutbuffer);
if (u->mark_set) {
@@ -97,7 +107,7 @@ index ec0b3a5..0a817c2 100644
/* If the "marking" operation was from right-->left or
* bottom-->top, then swap the mark points. */
if ((u->lineno == u->mark_begin_lineno && u->begin < u->mark_begin_x)
@@ -1089,7 +1095,7 @@ fprintf(stderr, " >> Updating... action = %d, fs->last_action = %d, openfile->c
@@ -1098,7 +1105,7 @@ fprintf(stderr, " >> Updating... action = %d, fs->last_action = %d, openfile->c
u->begin = u->mark_begin_x;
u->mark_begin_x = x_loc;
@@ -106,7 +116,7 @@ index ec0b3a5..0a817c2 100644
u->lineno = u->mark_begin_lineno;
u->mark_begin_lineno = line;
} else
@@ -1163,6 +1169,8 @@ bool do_wrap(filestruct *line)
@@ -1173,6 +1180,8 @@ bool do_wrap(filestruct *line)
/* The next line, minus indentation. */
size_t next_line_len = 0;
/* The length of next_line. */
@@ -115,7 +125,7 @@ index ec0b3a5..0a817c2 100644
/* There are three steps. First, we decide where to wrap. Then, we
* create the new wrap line. Finally, we clean up. */
@@ -1216,8 +1224,8 @@ bool do_wrap(filestruct *line)
@@ -1226,8 +1235,8 @@ bool do_wrap(filestruct *line)
add_undo(SPLIT_BEGIN);
#endif
@@ -127,5 +137,5 @@ index ec0b3a5..0a817c2 100644
/* Step 2, making the new wrap line. It will consist of indentation
--
1.8.3.4
2.2.2