--- logmsg.c~	Wed Mar  1 08:33:39 2000
+++ logmsg.c	Sun Mar 25 15:14:57 2001
@@ -585,6 +585,50 @@
 	    {
 		switch (*c)
 		{
+		/* perform escaped format file name */
+		case 'e':
+		    {
+			int len = strlen (str_list);
+			char * addstr = p->key;
+			char * send;
+			str_list =
+			    xrealloc (str_list,
+				  len + strlen (addstr) * 2 + 5);
+			send = str_list + len; /* String end */
+			while ( * addstr ) {
+			    switch ( * addstr ) {
+				case ' ' :
+				case ',' :
+				case '\\' :
+				    * send++ = '\\';
+			    }
+			    * send++ = * addstr++;
+			}
+			* send = 0;
+		    }
+		    break;
+		/* the tag format */
+		case 'T':
+		    {
+			int len = strlen (str_list);
+			char * send;
+			char * addstr = li->tag ? li->tag : "";
+			str_list =
+			    xrealloc (str_list,
+				  len + strlen (addstr) * 2 + 5);
+			send = str_list + len; /* String end */
+			while ( * addstr ) {
+			    switch ( * addstr ) {
+				case ' ' :
+				case ',' :
+				case '\\' :
+				    * send++ = '\\';
+			    }
+			    * send++ = * addstr++;
+			}
+			* send = 0;
+		    }
+		    break;
 		case 's':
 		    str_list =
 			xrealloc (str_list,