@@ -5,7 +5,8 @@

 # Run dirpersiststore in ~/.zlogout

 dirpersiststore () {

-    dirs -p | sed 's/ /\\ /g;s/^/pushd -q /;1!G;h;$!d;' > ~/.zdirstore

+# FIXME: need to escape all shell metacharacters, not just spaces!

+    dirs -p | sed 's/ /\\ /g;s/&/\\&/;s/^/pushd -q /;1!G;h;$!d;' > ~/.zdirstore

 }

 dirpersistrestore () {

@@ -19,4 +20,4 @@ setopt autopushd pushdminus pushdsilent pushdtohome pushdignoredups

 dirpersistrestore

 # Make popd changes permanent without having to wait for logout

-alias popd="popd;dirpersiststore"

\ No newline at end of file

+alias popd="popd;dirpersiststore"