* src/window.c (save_window_save): Obey window-point-insertion-type.

* lisp/window.el (window--state-get-1): Idem.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 51afe08d9a4cd2aa7933653f72458f06c0f828b8..caaab6d5a619f76590a33d71506fde9e0198b5f1 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2012-04-11  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * window.el (window--state-get-1): Obey window-point-insertion-type.
+
 2012-04-11  Lennart Borgman  <lennart.borgman@gmail.com>
 
        * emacs-lisp/lisp.el (narrow-to-defun): `beginning-of-defun' goes

diff --git a/lisp/window.el b/lisp/window.el
index c9e2469b0d28e66b1468524f331ba4baec918273..ca2cc9e795038623e156008003094055395aa5c8 100644 (file)
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -3643,7 +3643,11 @@ specific buffers."
                     (scroll-bars . ,(window-scroll-bars window))
                     (vscroll . ,(window-vscroll window))
                     (dedicated . ,(window-dedicated-p window))
-                    (point . ,(if writable point (copy-marker point)))
+                    (point . ,(if writable point
+                                 (copy-marker point
+                                              (buffer-local-value
+                                               'window-point-insertion-type
+                                               buffer))))
                     (start . ,(if writable start (copy-marker start)))))))))
         (tail
          (when (memq type '(vc hc))

diff --git a/src/ChangeLog b/src/ChangeLog
index 81eea170da1d2b8aa909b8973591c990ea157109..9fecec348702baccd49f59a92950472387ece576 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2012-04-11  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * window.c (save_window_save): Obey window-point-insertion-type.
+
 2012-04-11  Glenn Morris  <rgm@gnu.org>
 
        * Makefile.in (GNUSTEP_CFLAGS): Rename from C_SWITCH_X_SYSTEM.

diff --git a/src/window.c b/src/window.c
index af7968f9edf519545f447b8b583fbc03c4a1fb60..1f27cba444b0fad2e64f27aa85d943fd3e37a332 100644 (file)
--- a/src/window.c
+++ b/src/window.c
@@ -5945,6 +5945,8 @@ save_window_save (Lisp_Object window, struct Lisp_Vector *vector, int i)
            }
          else
            p->pointm = Fcopy_marker (w->pointm, Qnil);
+         XMARKER (p->pointm)->insertion_type
+           = !NILP (Vwindow_point_insertion_type);
 
          p->start = Fcopy_marker (w->start, Qnil);
          p->start_at_line_beg = w->start_at_line_beg;