procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Preserve window-point-insertion-type when copying window-point markers. (Bug#12588)

Browse source 
* window.el (record-window-buffer)
(display-buffer-record-window): When copying the markers to
window-point preserve window-point-insertion-type. (Bug#12588)
This commit is contained in:
Martin Rudalics 2012-11-13 08:40:07 +01:00
parent 6e5e9b70f5
commit 9234627530
2 changed files with 21 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lisp/ChangeLog
View file

@ -1,3 +1,9 @@
2012-11-13 Martin Rudalics <rudalics@gmx.at>
* window.el (record-window-buffer)
(display-buffer-record-window): When copying the markers to
window-point preserve window-point-insertion-type. (Bug#12588)
2012-11-13 Glenn Morris <rgm@gnu.org>
* emacs-lisp/eieio-datadebug.el (eieio-debug-methodinvoke):

24
lisp/window.el
View file

@ -3049,8 +3049,10 @@ WINDOW must be a live window and defaults to the selected one."
(set-marker (nth 2 entry) point))
;; Make new markers.
(list (copy-marker start)
(copy-marker point)))))
(copy-marker
;; Preserve window-point-insertion-type
;; (Bug#12588).
point window-point-insertion-type)))))
(set-window-prev-buffers
window (cons entry (window-prev-buffers window))))))))
@ -4555,13 +4557,17 @@ element is BUFFER."
;; If WINDOW has a quit-restore parameter, reset its car.
(setcar (window-parameter window 'quit-restore) 'same))
;; WINDOW shows another buffer.
(set-window-parameter
window 'quit-restore
(list 'other
;; A quadruple of WINDOW's buffer, start, point and height.
(list (window-buffer window) (window-start window)
(window-point window) (window-total-size window))
(selected-window) buffer))))
(with-current-buffer (window-buffer window)
(set-window-parameter
window 'quit-restore
(list 'other
;; A quadruple of WINDOW's buffer, start, point and height.
(list (current-buffer) (window-start window)
;; Preserve window-point-insertion-type (Bug#12588).
(copy-marker
(window-point window) window-point-insertion-type)
(window-total-size window))
(selected-window) buffer)))))
((eq type 'window)
;; WINDOW has been created on an existing frame.
(set-window-parameter