--- rxvt-unicode/src/init.C 2007/08/13 07:17:48 1.206 +++ rxvt-unicode/src/init.C 2007/09/08 20:54:50 1.209 @@ -404,8 +404,6 @@ else { val = strdup (rs[Rs_backspace_key]); - rxvt_Str_trim (val); - rxvt_Str_escaped (val); key_backspace = val; } #endif @@ -420,16 +418,9 @@ else { val = strdup (rs[Rs_delete_key]); - rxvt_Str_trim (val); - rxvt_Str_escaped (val); key_delete = val; } #endif - if (rs[Rs_answerbackstring]) - { - rxvt_Str_trim ((char *)rs[Rs_answerbackstring]); - rxvt_Str_escaped ((char *)rs[Rs_answerbackstring]); - } #ifdef HAVE_SCROLLBARS setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]); @@ -484,7 +475,6 @@ rxvt_term::init_env () { int i; - unsigned int u; char *val; #ifdef DISPLAY_IS_IP @@ -509,7 +499,7 @@ rs[Rs_display_name] = val; /* use broken `:0' value */ i = strlen (val); - env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); + env_display = (char *)rxvt_malloc (i + 9); sprintf (env_display, "DISPLAY=%s", val); @@ -540,7 +530,7 @@ if (rs[Rs_term_name] != NULL) { - env_term = (char *)rxvt_malloc ((strlen (rs[Rs_term_name]) + 6) * sizeof (char)); + env_term = (char *)rxvt_malloc (strlen (rs[Rs_term_name]) + 6); sprintf (env_term, "TERM=%s", rs[Rs_term_name]); putenv (env_term); } @@ -1402,7 +1392,7 @@ if (option (Opt_loginShell)) { - login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); + login = (char *)rxvt_malloc (strlen (argv0) + 2); login[0] = '-'; strcpy (&login[1], argv0);