[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/emacs-24 r110859: Preserve window-point-ins
From: |
martin rudalics |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/emacs-24 r110859: Preserve window-point-insertion-type when copying window-point markers. (Bug#12588) |
Date: |
Tue, 13 Nov 2012 08:40:07 +0100 |
User-agent: |
Bazaar (2.5.0) |
------------------------------------------------------------
revno: 110859
committer: martin rudalics <address@hidden>
branch nick: emacs-24
timestamp: Tue 2012-11-13 08:40:07 +0100
message:
Preserve window-point-insertion-type when copying window-point markers.
(Bug#12588)
* window.el (record-window-buffer)
(display-buffer-record-window): When copying the markers to
window-point preserve window-point-insertion-type. (Bug#12588)
modified:
lisp/ChangeLog
lisp/window.el
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2012-11-13 03:11:46 +0000
+++ b/lisp/ChangeLog 2012-11-13 07:40:07 +0000
@@ -1,3 +1,9 @@
+2012-11-13 Martin Rudalics <address@hidden>
+
+ * 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 <address@hidden>
* emacs-lisp/eieio-datadebug.el (eieio-debug-methodinvoke):
=== modified file 'lisp/window.el'
--- a/lisp/window.el 2012-11-11 01:47:56 +0000
+++ b/lisp/window.el 2012-11-13 07:40:07 +0000
@@ -3049,8 +3049,10 @@
(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 @@
;; 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
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/emacs-24 r110859: Preserve window-point-insertion-type when copying window-point markers. (Bug#12588),
martin rudalics <=