diff --git a/src/ChangeLog b/src/ChangeLog
index d5b441b42..526b2414b 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -4,6 +4,10 @@
 	Cyryllic with ncurses.
 	[HAS_ACS_AS_PCCHARS] (acs2pc_table): Make const.
 
+	* user.c (expand_format): Cast the argument to functions
+	for character classification to unsigned int.
+	(execute_menu_command): Likewise.
+
 2002-08-15  Pavel Roskin  <proski@gnu.org>
 
 	* treestore.c (tree_store_remove_entry): Don't use ts.check_name
diff --git a/src/user.c b/src/user.c
index 1aac9d1ef..ee43c696c 100644
--- a/src/user.c
+++ b/src/user.c
@@ -181,7 +181,7 @@ char *expand_format (WEdit *edit_widget, char c, int quote)
     if (c == '%')
 	return g_strdup ("%");
     
-    if (islower (c))
+    if (islower ((unsigned)c))
 	panel = cpanel;
     else {
 	if (get_other_type () != view_listing)
@@ -594,9 +594,9 @@ execute_menu_command (WEdit *edit_widget, char *commands)
 	    }
 	} else if (expand_prefix_found){
 	    expand_prefix_found = 0;
-	    if (isdigit (*commands)) {
+	    if (isdigit ((unsigned)*commands)) {
 		do_quote = atoi (commands);
-		while (isdigit (*commands))
+		while (isdigit ((unsigned)*commands))
 		    commands++;
 	    }
 	    if (*commands == '{')