diff --git a/CHANGES b/CHANGES
index 303375a1..ebb8877a 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,7 @@
 06 January 2009
 
+* Don't crash when backspacing if cursor is off the right of the screen,
+  reported by David Chisnall.
 * Complete words at any point inside command in prompt, also use option name
   as well as command names.
 * Per-client prompt history of up to 100 items.
@@ -800,7 +802,7 @@
   (including mutt, emacs). No status bar yet and no key remapping or other
   customisation.
 
-$Id: CHANGES,v 1.179 2009-01-06 17:04:56 nicm Exp $
+$Id: CHANGES,v 1.180 2009-01-06 18:24:37 nicm Exp $
 
  LocalWords:  showw utf UTF fulvio ciriaco joshe OSC APC gettime abc DEF OA clr
  LocalWords:  rivo nurges lscm Erdely eol smysession mysession ek dstname RB
diff --git a/TODO b/TODO
index 3571bba9..754cb402 100644
--- a/TODO
+++ b/TODO
@@ -47,6 +47,7 @@
 - next prev word etc in command prompt; also ^K
 - many more info() displays for various things
 - vi half page scroll
+- backspace should perhaps wrap backwards over newlines which were not moved down by a newline: screen and the OS X terminal does this but xterm and most others do not. this might be hard: a flag for each grid line (top bit of size maybe)? a single flag is insufficient as can't then tell when to /stop/ unwrapping
 - document status line options, title bits
 - document mode-fg/mode-bg/message-fg/message-bg
 - document window options changes