diff --git a/ChangeLog b/ChangeLog
index b91b99a..9d295fa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4557,3 +4557,13 @@ Sun Apr 14 22:34:41 2002                        Michael Jennings (mej)
 Fixed a bug spotted by Charles Clancy <tclancy@uiuc.edu> that caused
 color modifiers to mistakenly be applied to the icon pixmap.
 ----------------------------------------------------------------------
+Fri Apr 19 15:35:11 2002                        Michael Jennings (mej)
+
+Use safe_print_string() to decode string defines before printing them
+in --version output.  This fixes Debian bug #143328, submitted by
+Tom Gilbert <tom@linuxbrit.co.uk>.
+
+Also removed '~' from the CUTCHARS compiled-in default.  (It had
+already been removed from the themes.)  Makes double-click selection
+of URL's easier.  Requested by Laurence J. Lane <ljlane@debian.org>.
+----------------------------------------------------------------------
diff --git a/src/feature.h b/src/feature.h
index 289be73..583c369 100644
--- a/src/feature.h
+++ b/src/feature.h
@@ -156,7 +156,7 @@
 /* #define SAVELINES 256 */
 
 /* Set the default separator characters for double-click word selection */
-#define CUTCHARS "\"&'()*,;<=>?@[\\]^`{|}~ \t"
+#define CUTCHARS "\"&'()*,;<=>?@[\\]^`{|} \t"
 
 /* Make it an option */
 #define CUTCHAR_OPTION
diff --git a/src/options.c b/src/options.c
index d28acc2..9105212 100644
--- a/src/options.c
+++ b/src/options.c
@@ -721,7 +721,7 @@ version(void)
   printf("\n\nCompile-time definitions:\n");
 
 #ifdef PATH_ENV
-  printf(" PATH_ENV=\"%s\"\n", PATH_ENV);
+  printf(" PATH_ENV=\"%s\"\n", safe_print_string(PATH_ENV, sizeof(PATH_ENV) - 1));
 #else
   printf(" -PATH_ENV\n");
 #endif
@@ -731,12 +731,12 @@ version(void)
   printf(" -REFRESH_PERIOD\n");
 #endif
 #ifdef PRINTPIPE
-  printf(" PRINTPIPE=\"%s\"\n", PRINTPIPE);
+  printf(" PRINTPIPE=\"%s\"\n", safe_print_string(PRINTPIPE, sizeof(PRINTPIPE) - 1));
 #else
   printf(" -PRINTPIPE\n");
 #endif
 #ifdef KS_DELETE
-  printf(" KS_DELETE=\"%s\"\n", KS_DELETE);
+  printf(" KS_DELETE=\"%s\"\n", safe_print_string(KS_DELETE, sizeof(KS_DELETE) - 1));
 #else
   printf(" -KS_DELETE\n");
 #endif
@@ -746,7 +746,7 @@ version(void)
   printf(" -SAVELINES\n");
 #endif
 #ifdef CUTCHARS
-  printf(" CUTCHARS=\"%s\"\n", CUTCHARS);
+  printf(" CUTCHARS=\"%s\"\n", safe_print_string(CUTCHARS, sizeof(CUTCHARS) - 1));
 #else
   printf(" -CUTCHARS\n");
 #endif
@@ -776,7 +776,7 @@ version(void)
   printf(" -SCROLLBAR_CONTINUOUS_DELAY\n");
 #endif
 #ifdef ESCZ_ANSWER
-  printf(" ESCZ_ANSWER=\"%s\"\n", ESCZ_ANSWER);
+  printf(" ESCZ_ANSWER=\"%s\"\n", safe_print_string(ESCZ_ANSWER, sizeof(ESCZ_ANSWER) - 1));
 #else
   printf(" -ESCZ_ANSWER\n");
 #endif
diff --git a/src/pixmap.c b/src/pixmap.c
index c77c412..8ad4d07 100644
--- a/src/pixmap.c
+++ b/src/pixmap.c
@@ -1775,7 +1775,8 @@ colormod_trans(Pixmap p, imlib_t *iml, GC gc, unsigned short w, unsigned short h
 #endif
 	break;
       case 24:
-	if (ximg->bits_per_pixel != 32) {
+        /* FIXME:  Is this test needed? */
+	if (1 || (ximg->bits_per_pixel != 32)) {
 	  shade_ximage_24(ximg->data, ximg->bytes_per_line, w, h, rm, gm, bm);
 	  break;
 	}
@@ -2114,7 +2115,6 @@ set_icon_pixmap(char *filename, XWMHints * pwm_hints)
   imlib_context_set_anti_alias(1);
   imlib_context_set_dither(1);
   imlib_context_set_blend(0);
-  
   imlib_render_pixmaps_for_whole_image_at_size(&wm_hints->icon_pixmap, &wm_hints->icon_mask, w, h);
   if (check_for_enlightenment()) {
     wm_hints->flags |= IconPixmapHint | IconMaskHint;