Merge branch 'obsd-master'

1 files changed, 3 insertions, 1 deletions

diff --git a/names.c b/names.c
index 1997899e..661ba06e 100644
--- a/names.c
+++ b/names.c
@@ -151,7 +151,9 @@ parse_window_name(const char *in)
 
 	if (*name != '\0') {
 		ptr = name + strlen(name) - 1;
-		while (ptr > name && !isalnum((u_char)*ptr))
+		while (ptr > name &&
+		    !isalnum((u_char)*ptr) &&
+		    !ispunct((u_char)*ptr))
 			*ptr-- = '\0';
 	}