* src/editfns.c (save_restriction_restore): Don't forget to invalidate the

current_column cache.

Fixes: debbugs:7946

diff --git a/src/ChangeLog b/src/ChangeLog
index 8bc84675c92251281b15b29c9aeb29932f3e1e5f..a665fd73047b1ea6e2547c0d48664add8c45c716 100644 (file)
--- 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 e8c1aef3503181c653c33aa5970a1930090e1a18..fe5b039625fc1ea50cea35a325c48bdcd32ed21a 100644 (file)
--- 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);