From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Wed, 11 Apr 2012 02:36:04 +0000 (-0400)
Subject: * src/window.c (save_window_save): Obey window-point-insertion-type.
X-Git-Tag: emacs-24.2.90~471^2~364^2~39
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=de8c03dc519ca124da1b410f744b3a69531fb79b;p=emacs.git

* 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 51afe08d9a4..caaab6d5a61 100644
--- 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 c9e2469b0d2..ca2cc9e7950 100644
--- 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 81eea170da1..9fecec34870 100644
--- 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 af7968f9edf..1f27cba444b 100644
--- 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;