Fix patch break

diff --git a/patches/gitstatus/mainline.diff b/patches/gitstatus/mainline.diff
index b002533b565948cc8b5580730e6ac6fe206acd0f..f574dc5ff46aa2f3c4eedde71d261158d08e5e92 100644 (file)
--- a/patches/gitstatus/mainline.diff
+++ b/patches/gitstatus/mainline.diff
@@ -165,7 +165,7 @@ index 67523fe6..c965bd1c 100644
 +
 +                      for (size_t i = 0; i < git_statuses.len; ++i)
 +                              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)) {
 +                                              if (git_statuses.statuses[i].status != GIT_STATUS_IGNORED)
 +                                                      git_statuses.show = TRUE;

diff --git a/patches/gitstatus/namefirst.diff b/patches/gitstatus/namefirst.diff
index a09dd47486f32c5c0fd847e65790bdb4b78fe54a..14e92cd692947ee91c33452301d112e3593a65d3 100644 (file)
--- a/patches/gitstatus/namefirst.diff
+++ b/patches/gitstatus/namefirst.diff
@@ -166,7 +166,7 @@ index b8b222d4..80ef884f 100644
 +
 +                      for (size_t i = 0; i < git_statuses.len; ++i)
 +                              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)) {
 +                                              if (git_statuses.statuses[i].status != GIT_STATUS_IGNORED)
 +                                                      git_statuses.show = TRUE;

diff --git a/patches/namefirst/mainline.diff b/patches/namefirst/mainline.diff
index 4f46b3615df98b7be64c5ef7f0d000f5bcb98eaa..d73b8e55c68b3af567251ba61ce3d4f6390057c9 100644 (file)
--- a/patches/namefirst/mainline.diff
+++ b/patches/namefirst/mainline.diff
@@ -130,7 +130,7 @@ index eabe30f0..d8dc5925 100644
 +
 +              if (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);
 +              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, ' ',