Mercurial > ~dholland > hg > tradcpp > index.cgi

changeset 45:f263adbf7445

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge
author David A. Holland
date Sat, 30 Mar 2013 22:33:53 -0400
parents ad7763329eba (diff) 57e0c7a50b2d (current diff)
children eaa154ded584
files
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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;