# HG changeset patch
# User David A. Holland
# Date 1364697233 14400
# Node ID f263adbf7445b3584819e3b6ec0dc085903c505f
# Parent  ad7763329eba34015a3a020b2bfd683d215957bf# Parent  57e0c7a50b2d038e0e1eeeacc30907e49fd7c2f3
merge

diff -r 57e0c7a50b2d -r f263adbf7445 macro.c
--- a/macro.c	Sun Mar 31 04:20:44 2013 +0200
+++ b/macro.c	Sat Mar 30 22:33:53 2013 -0400
@@ -844,7 +844,7 @@
 			break;
 		}
 		m = macrotable_findlen(buf, len, false);
-		if (m == NULL) {
+		if (m == NULL || m->inuse) {
 			expand_send(es, p, buf, len);
 		} else if (!m->hasparams) {
 			m->inuse = true;