mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-03 22:20:52 -08:00
Code Issues Projects Releases Wiki Activity

In window states don't deal with the mark.

Browse source 
* window.el (window--state-get-1, window--state-put-2): Don't
save and restore the mark.
This commit is contained in:
Jérémy Compostella 2012-01-25 15:28:01 +01:00 • committed by Martin Rudalics
parent 40047858c6
commit fa8eafefbe
2 changed files with 7 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

5
lisp/ChangeLog
View file

@ -1,3 +1,8 @@
2012-01-25 Jérémy Compostella <jeremy.compostella@gmail.com>
* window.el (window--state-get-1, window--state-put-2): Don't
save and restore the mark.
2012-01-25 Chong Yidong <cyd@gnu.org>
* custom.el (custom-variable-p): Doc fix.

11
lisp/window.el
View file

@ -3622,10 +3622,7 @@ specific buffers."
(vscroll . ,(window-vscroll window))
(dedicated . ,(window-dedicated-p window))
(point . ,(if writable point (copy-marker point)))
(start . ,(if writable start (copy-marker start)))
,@(when mark
`((mark . ,(if writable
mark (copy-marker mark))))))))))))
(start . ,(if writable start (copy-marker start))))))))))
(tail
(when (memq type '(vc hc))
(let (list)
@ -3809,11 +3806,7 @@ value can be also stored on disk and read back in a new session."
;; have been created and sized).
(ignore-errors
(set-window-start window (cdr (assq 'start state)))
(set-window-point window (cdr (assq 'point state)))
;; I'm not sure whether we should set the mark here, but maybe
;; it can be used.
(let ((mark (cdr (assq 'mark state))))
(when mark (set-mark mark))))
(set-window-point window (cdr (assq 'point state))))
;; Select window if it's the selected one.
(when (cdr (assq 'selected state))
(select-window window)))))))