--- lib/readline/display.c	2005-01-18 12:34:39.489668286 +0000
+++ lib/readline/display.c	2005-01-18 12:35:29.127187527 +0000
@@ -622,10 +622,11 @@
              
       inv_lbreaks[++newlines] = temp;
 #if defined (HANDLE_MULTIBYTE)
-      lpos -= _rl_col_width (local_prompt, n0, num);
-#else
-      lpos -= _rl_screenwidth;
+      if (local_prompt)
+        lpos -= _rl_col_width (local_prompt, n0, num);
+      else
 #endif
+      lpos -= _rl_screenwidth;
     }
 
   prompt_last_screen_line = newlines;