Use the transclude macro instead of list tagging in the tag popup

core/modules/macros/list.js

@@ -29,9 +29,6 @@ var handlers = {
 		// Server syncing isn't implemented yet
 		return [];
 	},
-	tagging: function(wiki,tiddlerTitle) {
-		return wiki.getTiddlersWithTag(tiddlerTitle);
-	},
 	filter: function(wiki) {
 		// Filters aren't implemented yet
 		return [];

core/modules/macros/transclude.js

@@ -18,7 +18,8 @@ exports.info = {
 		filter: {byPos: 0, type: "filter"},
 		title: {byPos: 1, type: "tiddler"},
 		templateTitle: {byName: true, type: "text"},
-		templateText: {byName: true, type: "text"}
+		templateText: {byName: true, type: "text"},
+		emptyMessage: {byName: true, type: "text"}
 	}
 };
 
@@ -51,14 +52,22 @@ exports.executeMacro = function() {
 			templateParseTree = this.wiki.parseText("text/x-tiddlywiki","<<view text wikified>>");
 		}
 	}
-	// Render the tiddlers through the template
+	// Use the empty message if the list is empty
-	nodes = [];
+	if(titles.length === 0 && this.hasParameter("emptyMessage")) {
-	for(t=0; t<titles.length; t++) {
+		nodes = this.wiki.parseText("text/x-tiddlywiki",this.params.emptyMessage).tree;
-		title = titles[t];
+		for(c=0; c<nodes.length; c++) {
-		for(c=0; c<templateParseTree.tree.length; c++) {
+			nodes[c].execute(this.parents,this.tiddlerTitle);
-			node = templateParseTree.tree[c].clone();
+		}
-			node.execute(parents,title);
+	} else {
-			nodes.push(node);
+		// Render the tiddlers through the template
+		nodes = [];
+		for(t=0; t<titles.length; t++) {
+			title = titles[t];
+			for(c=0; c<templateParseTree.tree.length; c++) {
+				node = templateParseTree.tree[c].clone();
+				node.execute(parents,title);
+				nodes.push(node);
+			}
 		}
 	}
 	// Return

core/templates/TagTemplate.tid

@@ -12,7 +12,11 @@ title: $:/templates/TagTemplate
 <<reveal state:TagDropDownLocation type:popup qualifyTiddlerTitles:yes><
 <div class="open">
 {{dropdown-menu{
-<<list tagging>>
+(((
+
+[is[current]tagging[]]
+
+)) <<view title link>> )
 }}}
 </div>
 >>