mirrors/nnn
1
0
Fork 0
mirror of https://github.com/jarun/nnn.git synced 2024-11-24 11:51:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix patch break

Browse source
This commit is contained in:
Arun Prakash Jana 2021-06-20 21:25:22 +05:30
parent 983babc5f6
commit d9f988e7ed
No known key found for this signature in database
GPG key ID: A75979F35C080412
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
patches/gitstatus/mainline.diff
View file

@ -165,7 +165,7 @@ index 67523fe6..c965bd1c 100644
+ +
+ for (size_t i = 0; i < git_statuses.len; ++i) + for (size_t i = 0; i < git_statuses.len; ++i)
+ if (git_statuses.statuses[i].status) + if (git_statuses.statuses[i].status)
+ if ((dentp->flags & DIR_OR_LINK_TO_DIR) ? (is_prefix(git_statuses.statuses[i].path, dentpath, namebuflen) && + if ((dentp->flags & DIR_OR_DIRLNK) ? (is_prefix(git_statuses.statuses[i].path, dentpath, namebuflen) &&
+ namebuflen <= xstrlen(git_statuses.statuses[i].path)) : !xstrcmp(git_statuses.statuses[i].path, dentpath)) { + namebuflen <= xstrlen(git_statuses.statuses[i].path)) : !xstrcmp(git_statuses.statuses[i].path, dentpath)) {
+ if (git_statuses.statuses[i].status != GIT_STATUS_IGNORED) + if (git_statuses.statuses[i].status != GIT_STATUS_IGNORED)
+ git_statuses.show = TRUE; + git_statuses.show = TRUE;

2
patches/gitstatus/namefirst.diff
View file

@ -166,7 +166,7 @@ index b8b222d4..80ef884f 100644
+ +
+ for (size_t i = 0; i < git_statuses.len; ++i) + for (size_t i = 0; i < git_statuses.len; ++i)
+ if (git_statuses.statuses[i].status) + if (git_statuses.statuses[i].status)
+ if ((dentp->flags & DIR_OR_LINK_TO_DIR) ? (is_prefix(git_statuses.statuses[i].path, dentpath, namebuflen) && + if ((dentp->flags & DIR_OR_DIRLNK) ? (is_prefix(git_statuses.statuses[i].path, dentpath, namebuflen) &&
+ namebuflen <= xstrlen(git_statuses.statuses[i].path)) : !xstrcmp(git_statuses.statuses[i].path, dentpath)) { + namebuflen <= xstrlen(git_statuses.statuses[i].path)) : !xstrcmp(git_statuses.statuses[i].path, dentpath)) {
+ if (git_statuses.statuses[i].status != GIT_STATUS_IGNORED) + if (git_statuses.statuses[i].status != GIT_STATUS_IGNORED)
+ git_statuses.show = TRUE; + git_statuses.show = TRUE;

2
patches/namefirst/mainline.diff
View file

@ -130,7 +130,7 @@ index eabe30f0..d8dc5925 100644
+ +
+ if (attrs) + if (attrs)
+ attron(attrs); + attron(attrs);
+ if (!g_state.oldcolor && (type == S_IFDIR || (type == S_IFLNK && ent->flags & DIR_OR_LINK_TO_DIR))) + if (!g_state.oldcolor && (type == S_IFDIR || (type == S_IFLNK && ent->flags & DIR_OR_DIRLNK)))
+ attroff(A_BOLD); + attroff(A_BOLD);
+ size_t sizelen = (type == S_IFREG || type == S_IFDIR) ? xstrlen(size = coolsize(cfg.blkorder ? ent->blocks << blk_shift : ent->size)) : 1; + size_t sizelen = (type == S_IFREG || type == S_IFDIR) ? xstrlen(size = coolsize(cfg.blkorder ? ent->blocks << blk_shift : ent->size)) : 1;
+ printw("%*c%*s%s%s", 1 + MIN(namecols, dtls.maxnameln + (size_t)(ind ? 0 : 1)) - namelen, ' ', + printw("%*c%*s%s%s", 1 + MIN(namecols, dtls.maxnameln + (size_t)(ind ? 0 : 1)) - namelen, ' ',