Merge branch 'jn/mailinfo-scissors'

* jn/mailinfo-scissors: Teach mailinfo %< as an alternative scissors mark
git-mirror · Apr 7, 2010 · d6b5af6 · d6b5af6
2 parents e3af3cf + 9974e29
commit d6b5af6
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/builtin/mailinfo.c b/builtin/mailinfo.c
@@ -746,7 +746,8 @@ static int is_scissors_line(const struct strbuf *line)
 			continue;
 		}
 		if (i + 1 < len &&
-		    (!memcmp(buf + i, ">8", 2) || !memcmp(buf + i, "8<", 2))) {
+		    (!memcmp(buf + i, ">8", 2) || !memcmp(buf + i, "8<", 2) ||
+		     !memcmp(buf + i, ">%", 2) || !memcmp(buf + i, "%<", 2))) {
 			in_perforation = 1;
 			perforation += 2;
 			scissors += 2;