diff --git a/src/ChangeLog b/src/ChangeLog
index 8bc84675c92..a665fd73047 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2011-02-02  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* editfns.c (save_restriction_restore): Don't forget to invalidate the
+	current_column cache (bug#7946).
+
 2011-02-02  Kenichi Handa  <handa@m17n.org>
 
 	* ftfont.c (ftfont_open): Use FC_DUAL only when it is defined.
diff --git a/src/editfns.c b/src/editfns.c
index e8c1aef3503..fe5b039625f 100644
--- a/src/editfns.c
+++ b/src/editfns.c
@@ -3347,6 +3347,9 @@ save_restriction_restore (data)
 	}
     }
 
+  /* Changing the buffer bounds invalidates any recorded current column.  */
+  invalidate_current_column ();
+
   if (cur)
     set_buffer_internal (cur);