summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBoris Faure <billiob@gmail.com>2019-09-04 00:29:07 +0200
committerBoris Faure <billiob@gmail.com>2019-09-04 00:29:07 +0200
commit48a8a93900419883c2aba7a88971764792e9668e (patch)
tree9d8ea438ec0642212da248d2dbbc7a549df14720 /src
parent448d583ccdda1072d169d45b5448ba6ba9dd2f94 (diff)
parentf01c312f015d5744fbe546ea7601f0f1de93d40b (diff)
Merge branch 'terminology-1.5'
Diffstat (limited to 'src')
-rw-r--r--src/bin/sb.c1
-rw-r--r--src/bin/termio.c1
2 files changed, 1 insertions, 1 deletions
diff --git a/src/bin/sb.c b/src/bin/sb.c
index b2bffa5..a0dd9e8 100644
--- a/src/bin/sb.c
+++ b/src/bin/sb.c
@@ -43,6 +43,7 @@ ty_sb_prepend(struct ty_sb *sb, const char *s, size_t len)
43 return -1; 43 return -1;
44 44
45 memcpy(new_buf + new_gap, sb->buf, sb->len); 45 memcpy(new_buf + new_gap, sb->buf, sb->len);
46 free(sb->buf - sb->gap);
46 sb->buf = new_buf + new_gap; 47 sb->buf = new_buf + new_gap;
47 sb->gap = new_gap; 48 sb->gap = new_gap;
48 sb->alloc = new_alloc; 49 sb->alloc = new_alloc;
diff --git a/src/bin/termio.c b/src/bin/termio.c
index b8c4246..dea782e 100644
--- a/src/bin/termio.c
+++ b/src/bin/termio.c
@@ -2386,7 +2386,6 @@ _smart_mouseover_apply(Termio *sd)
2386 if (sd->link.string) 2386 if (sd->link.string)
2387 eina_stringshare_del(sd->link.string); 2387 eina_stringshare_del(sd->link.string);
2388 sd->link.string = eina_stringshare_add(s); 2388 sd->link.string = eina_stringshare_add(s);
2389 s = NULL;
2390 2389
2391 if ((x1 == sd->link.x1) && (y1 == sd->link.y1) && 2390 if ((x1 == sd->link.x1) && (y1 == sd->link.y1) &&
2392 (x2 == sd->link.x2) && (y2 == sd->link.y2)) 2391 (x2 == sd->link.x2) && (y2 == sd->link.y2))