Merge svn changes up to r30264

Conflicts:
	gui/wm/ws.c

1 files changed, 4 insertions, 4 deletions

diff --git a/subreader.c b/subreader.c
index f1b5b44f5e..a6b40ac3ec 100644
--- a/subreader.c
+++ b/subreader.c
@@ -1734,18 +1734,18 @@ char * strreplace( char * in,char * what,char * whereof )
 static void strcpy_trim(char *d, char *s)
 {
     // skip leading whitespace
-    while (*s && !isalnum(*s)) {
+    while (*s && isspace(*s)) {
 	s++;
     }
     for (;;) {
 	// copy word
-	while (*s && isalnum(*s)) {
+	while (*s && !isspace(*s)) {
 	    *d = tolower(*s);
 	    s++; d++;
 	}
 	if (*s == 0) break;
 	// trim excess whitespace
-	while (*s && !isalnum(*s)) {
+	while (*s && isspace(*s)) {
 	    s++;
 	}
 	if (*s == 0) break;
@@ -1784,7 +1784,7 @@ static void strcpy_get_ext(char *d, char *s)
 static int whiteonly(char *s)
 {
     while (*s) {
-	if (isalnum(*s)) return 0;
+	if (!isspace(*s)) return 0;
 	s++;
   }
     return 1;