WIP

sdottaka · sdottaka · commit 4fcfe19c5f60 · 2025-01-22T08:14:10.000+09:00
diff --git a/Src/DirActions.cpp b/Src/DirActions.cpp
@@ -1086,8 +1086,7 @@ int GetColImage(const DIFFITEM &di)
  */
 void CopyDiffSideAndProperties(CDiffContext& ctxt, DIFFITEM& di, int src, int dst, int action)
 {
-	if (di.diffcode.exists(src) &&
-		(action != FileActionItem::UI_COPY_DIFFITEMS || di.diffcode.isResultDiff()))
+	if (IsItemCopyable(di, src, action == FileActionItem::UI_COPY_DIFFITEMS))
 	{
 		di.diffcode.diffcode |= (DIFFCODE::FIRST << dst);
 		// copy file properties other than ctime 

Original file line number	Diff line number	Diff line change
`@@ -1086,8 +1086,7 @@ int GetColImage(const DIFFITEM &di)`
`1086`	`1086`	`*/`
`1087`	`1087`	`void CopyDiffSideAndProperties(CDiffContext& ctxt, DIFFITEM& di, int src, int dst, int action)`
`1088`	`1088`	`{`
`1089`		`- if (di.diffcode.exists(src) &&`
`1090`		`- (action != FileActionItem::UI_COPY_DIFFITEMS \|\| di.diffcode.isResultDiff()))`
	`1089`	`+ if (IsItemCopyable(di, src, action == FileActionItem::UI_COPY_DIFFITEMS))`
`1091`	`1090`	`{`
`1092`	`1091`	`di.diffcode.diffcode \|= (DIFFCODE::FIRST << dst);`
`1093`	`1092`	`// copy file properties other than ctime`