* src/window.c (save_window_save): Lookup window_point_insertion_type in

the right buffer.
(Qwindow_point_insertion_type): New var.
(syms_of_window): Initialize it.

Fixes: debbugs:15457

diff --git a/src/ChangeLog b/src/ChangeLog
index 1899edae349268becf3d7e7ffa5493570bd277b9..84760abd0192aa64965b8a9d4e2a1fa391184b50 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,10 @@
+2014-04-16  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * window.c (save_window_save): Lookup window_point_insertion_type in
+       the right buffer (bug#15457).
+       (Qwindow_point_insertion_type): New var.
+       (syms_of_window): Initialize it.
+
 2014-04-16  Eli Zaretskii  <eliz@gnu.org>
 
        * unexcoff.c [MSDOS]: Include libc/atexit.h.
@@ -26,8 +33,8 @@
 
        * msdos.c (check_window_system): Remove unnecessary an
        incompatible duplicate function.
-       (sys_opendir, readlinkat, faccessat, fstatat, unsetenv): New
-       functions in support of new functionality.
+       (sys_opendir, readlinkat, faccessat, fstatat, unsetenv):
+       New functions in support of new functionality.
 
        * menu.c (single_menu_item): Add visual indication  of submenu
        also for menus on MSDOS frames.
@@ -211,7 +218,7 @@
        (adjust_after_replace):
        (replace_range): Pass value for new record_markers arg to
        delete_record.
-       * undo.c (record_marker_adjustment): Renamed to
+       * undo.c (record_marker_adjustment): Rename to
        record_marker_adjustments and made static.
        (record_delete): Check record_markers arg and call
        record_marker_adjustments.

diff --git a/src/w32term.c b/src/w32term.c
index 2fe73a3eb48ab92d20f97ea96318c4f8bec464c4..f914b5f862567b3155c61652ea8dfbda56692bef 100644 (file)
--- a/src/w32term.c
+++ b/src/w32term.c
@@ -4726,7 +4726,7 @@ w32_read_socket (struct terminal *terminal,
                           here since Windows sends a WM_MOVE message
                           BEFORE telling us the Window is minimized
                           when the Window is iconified, with 3000,3000
-                          as the co-ords. */
+                          as the co-ords.  */
                        x_real_positions (f, &f->left_pos, &f->top_pos);
 
                        inev.kind = DEICONIFY_EVENT;

diff --git a/src/window.c b/src/window.c
index f42219cae940e1bc748b27d5fd22878253a42f3e..8e8252d3b76534bcc88e5d7e50312ce0fe5dc9b6 100644 (file)
--- a/src/window.c
+++ b/src/window.c
@@ -55,6 +55,7 @@ static Lisp_Object Qwindow_pixel_to_total;
 static Lisp_Object Qscroll_up, Qscroll_down, Qscroll_command;
 static Lisp_Object Qsafe, Qabove, Qbelow, Qwindow_size, Qclone_of;
 static Lisp_Object Qfloor, Qceiling;
+static Lisp_Object Qwindow_point_insertion_type;
 
 static int displayed_window_lines (struct window *);
 static int count_windows (struct window *);
@@ -124,7 +125,7 @@ static int window_initialized;
 /* Hook to run when window config changes.  */
 static Lisp_Object Qwindow_configuration_change_hook;
 
-/* Used by the function window_scroll_pixel_based */
+/* Used by the function window_scroll_pixel_based.  */
 static int window_scroll_pixel_based_preserve_x;
 static int window_scroll_pixel_based_preserve_y;
 
@@ -6618,7 +6619,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);
+           = !NILP (buffer_local_value_1 /* Don't signal error if void.  */
+                    (Qwindow_point_insertion_type, w->contents));
 
          p->start = Fcopy_marker (w->start, Qnil);
          p->start_at_line_beg = w->start_at_line_beg ? Qt : Qnil;
@@ -7235,6 +7237,7 @@ on their symbols to be controlled by this variable.  */);
   DEFVAR_LISP ("window-point-insertion-type", Vwindow_point_insertion_type,
               doc: /* Type of marker to use for `window-point'.  */);
   Vwindow_point_insertion_type = Qnil;
+  DEFSYM (Qwindow_point_insertion_type, "window_point_insertion_type");
 
   DEFVAR_LISP ("window-configuration-change-hook",
               Vwindow_configuration_change_hook,