Merge from emacs-24 branch

[gnu-emacs] / lisp / window.el

diff --git a/lisp/window.el b/lisp/window.el
index 28abec426804d12b848c7623c89ac9707f63f24f..c148f5ee01fc34fe2621f9fdf1fc1909d14aedd1 100644 (file)
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -3654,7 +3654,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))
@@ -5450,7 +5454,7 @@ A value of t means point moves to the beginning or the end of the buffer
 \(depending on scrolling direction) when no more scrolling possible.
 When point is already on that position, then signal an error."
   :type 'boolean
-  :group 'scrolling
+  :group 'windows
   :version "24.1")
 
 (defun scroll-up-command (&optional arg)