aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorStefan Monnier2012-04-10 22:36:04 -0400
committerStefan Monnier2012-04-10 22:36:04 -0400
commitde8c03dc519ca124da1b410f744b3a69531fb79b (patch)
tree4e5d1e79bc44f0ece9a23ca198ea138591aa68cb /src
parent050cc68b402f5998193a6026d0eeeecb9d2cb9c4 (diff)
downloademacs-de8c03dc519ca124da1b410f744b3a69531fb79b.tar.gz
emacs-de8c03dc519ca124da1b410f744b3a69531fb79b.zip
* src/window.c (save_window_save): Obey window-point-insertion-type.
* lisp/window.el (window--state-get-1): Idem.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog4
-rw-r--r--src/window.c2
2 files changed, 6 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 81eea170da1..9fecec34870 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
12012-04-11 Stefan Monnier <monnier@iro.umontreal.ca>
2
3 * window.c (save_window_save): Obey window-point-insertion-type.
4
12012-04-11 Glenn Morris <rgm@gnu.org> 52012-04-11 Glenn Morris <rgm@gnu.org>
2 6
3 * Makefile.in (GNUSTEP_CFLAGS): Rename from C_SWITCH_X_SYSTEM. 7 * 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)
5945 } 5945 }
5946 else 5946 else
5947 p->pointm = Fcopy_marker (w->pointm, Qnil); 5947 p->pointm = Fcopy_marker (w->pointm, Qnil);
5948 XMARKER (p->pointm)->insertion_type
5949 = !NILP (Vwindow_point_insertion_type);
5948 5950
5949 p->start = Fcopy_marker (w->start, Qnil); 5951 p->start = Fcopy_marker (w->start, Qnil);
5950 p->start_at_line_beg = w->start_at_line_beg; 5952 p->start_at_line_beg = w->start_at_line_beg;