emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] /srv/bzr/emacs/emacs-24 r107862: * src/window.c (save_wind


From: Stefan Monnier
Subject: [Emacs-diffs] /srv/bzr/emacs/emacs-24 r107862: * src/window.c (save_window_save): Obey window-point-insertion-type.
Date: Fri, 02 Nov 2012 01:48:55 -0000
User-agent: Bazaar (2.5.0)

------------------------------------------------------------
revno: 107862
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Tue 2012-04-10 22:36:04 -0400
message:
  * src/window.c (save_window_save): Obey window-point-insertion-type.
  * lisp/window.el (window--state-get-1): Idem.
modified:
  lisp/ChangeLog
  lisp/window.el
  src/ChangeLog
  src/window.c
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-04-11 02:12:20 +0000
+++ b/lisp/ChangeLog    2012-04-11 02:36:04 +0000
@@ -1,3 +1,7 @@
+2012-04-11  Stefan Monnier  <address@hidden>
+
+       * window.el (window--state-get-1): Obey window-point-insertion-type.
+
 2012-04-11  Lennart Borgman  <address@hidden>
 
        * emacs-lisp/lisp.el (narrow-to-defun): `beginning-of-defun' goes

=== modified file 'lisp/window.el'
--- a/lisp/window.el    2012-04-05 22:26:20 +0000
+++ b/lisp/window.el    2012-04-11 02:36:04 +0000
@@ -3643,7 +3643,11 @@
                     (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))

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-04-11 01:25:51 +0000
+++ b/src/ChangeLog     2012-04-11 02:36:04 +0000
@@ -1,3 +1,7 @@
+2012-04-11  Stefan Monnier  <address@hidden>
+
+       * window.c (save_window_save): Obey window-point-insertion-type.
+
 2012-04-11  Glenn Morris  <address@hidden>
 
        * Makefile.in (GNUSTEP_CFLAGS): Rename from C_SWITCH_X_SYSTEM.

=== modified file 'src/window.c'
--- a/src/window.c      2012-03-31 18:10:34 +0000
+++ b/src/window.c      2012-04-11 02:36:04 +0000
@@ -5945,6 +5945,8 @@
            }
          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;


reply via email to

[Prev in Thread] Current Thread [Next in Thread]