From 0b69e88b2940e5e76ecb54b80442ebfea781182a Mon Sep 17 00:00:00 2001
From: pmario <pmariojo@gmail.com>
Date: Fri, 16 Feb 2024 21:36:15 +0100
Subject: [PATCH] search-variables -- fix filter using subfiter parameter

---
 core/wiki/macros/dumpvariables.tid | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/core/wiki/macros/dumpvariables.tid b/core/wiki/macros/dumpvariables.tid
index 5db23a919..a4a73a3e3 100644
--- a/core/wiki/macros/dumpvariables.tid
+++ b/core/wiki/macros/dumpvariables.tid
@@ -16,7 +16,7 @@ tags: $:/tags/Macro
 \end
 
 <!-- =================== -->
-\procedure search-variables(subfilter:"[<currentTiddler>]")
+\procedure search-variables(subfilter:"[variables[]]")
 
 \procedure search() $:/temp/search/dump
 \procedure sub-search() $:/temp/search/sub-dump
@@ -56,7 +56,6 @@ tags: $:/tags/Macro
 \end expandAllStatesButton
 
 \procedure info()
-<!-- <$let xx={{{ "\define" [<varname>] +[join[ ]] }}}> -->
 <div class="multi-columns">
 	<$list filter="[all[tiddlers+shadows]] :filter[search:text,tags:words<getSubSearchText>] 
 		:filter[!prefix[$:/temp]]
@@ -71,7 +70,6 @@ tags: $:/tags/Macro
 </div>
 \end info
 
-
 \function getSearchText() [<search>get[text]]
 
 \function getSubSearch() [<sub-search>] [<varname>] [<qualify>] +[join[/]]
@@ -80,7 +78,7 @@ tags: $:/tags/Macro
 \function getVarState() [<state>addsuffix<varname>] [<qualify>] +[join[]]
 \function getToggleInfoState() [<state>addsuffix<varname>]
 
-<$text text="Search Variables - "/><%if [<thisTiddler>!match[$:/AdvancedSearch]]%><code><<subfilter>></code><%endif%>
+<$text text="Search Variables - "/><%if [<thisTiddler>!match[$:/AdvancedSearch]]%><code class="tc-small-gap-right"><<subfilter>></code><%endif%>
 <$edit-text tiddler=<<search>> tag=input/> <<clearSearchButton>>
 <% if [<state>get[text]match[yes]] %>
 	<<clearStatesButton>>
@@ -88,7 +86,8 @@ tags: $:/tags/Macro
 	<<expandAllStatesButton>>
 <% endif %>
 
-<$list filter="[variables[]] +[search::some<getSearchText>] :filter[subfilter<subfilter>]" variable="varname">
+<!-- <$list filter="[variables[]] +[search::some<getSearchText>] :filter[subfilter<subfilter>]" variable="varname"> -->
+<$list filter="[variables[]] +[search::some<getSearchText>] :and[subfilter<subfilter>]" variable="varname">
 <div class="tc-var-item">
 	<$button actions=<<toggleState>> class="tc-small-gap-left tc-btn-invisible">
 		<% if [<getVarState>get[text]match[yes]] %>