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

Ignore fixed-sizeness when getting a window's state.

Browse source 
* window.el (window-state-get, window--state-get-1): Don't deal
with fixed-sizeness of windows.  Simplify code.
This commit is contained in:
Martin Rudalics 2012-01-25 15:52:10 +01:00
parent fa8eafefbe
commit 1edf595d75
2 changed files with 20 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lisp/ChangeLog
View file

@ -1,3 +1,8 @@
2012-01-25 Martin Rudalics <rudalics@gmx.at>
* window.el (window-state-get, window--state-get-1): Don't deal
with fixed-sizeness of windows. Simplify code.
2012-01-25 Jérémy Compostella <jeremy.compostella@gmail.com>
* window.el (window--state-get-1, window--state-put-2): Don't

38
lisp/window.el
View file

@ -3604,25 +3604,20 @@ specific buffers."
(when list
`((parameters . ,list))))
,@(when buffer
;; All buffer related things go in here - make the buffer
;; current when retrieving `point' and `mark'.
(with-current-buffer (window-buffer window)
(let ((point (window-point-1 window))
(start (window-start window))
(mark (mark t)))
`((buffer
,(buffer-name buffer)
(selected . ,selected)
,@(when window-size-fixed
`((size-fixed . ,window-size-fixed)))
(hscroll . ,(window-hscroll window))
(fringes . ,(window-fringes window))
(margins . ,(window-margins window))
(scroll-bars . ,(window-scroll-bars window))
(vscroll . ,(window-vscroll window))
(dedicated . ,(window-dedicated-p window))
(point . ,(if writable point (copy-marker point)))
(start . ,(if writable start (copy-marker start))))))))))
;; All buffer related things go in here.
(let ((point (window-point-1 window))
(start (window-start window)))
`((buffer
,(buffer-name buffer)
(selected . ,selected)
(hscroll . ,(window-hscroll window))
(fringes . ,(window-fringes window))
(margins . ,(window-margins window))
(scroll-bars . ,(window-scroll-bars window))
(vscroll . ,(window-vscroll window))
(dedicated . ,(window-dedicated-p window))
(point . ,(if writable point (copy-marker point)))
(start . ,(if writable start (copy-marker start)))))))))
(tail
(when (memq type '(vc hc))
(let (list)
@ -3667,10 +3662,7 @@ value can be also stored on disk and read back in a new session."
(min-height-ignore . ,(window-min-size window nil t))
(min-width-ignore . ,(window-min-size window t t))
(min-height-safe . ,(window-min-size window nil 'safe))
(min-width-safe . ,(window-min-size window t 'safe))
;; These are probably not needed.
,@(when (window-size-fixed-p window) `((fixed-height . t)))
,@(when (window-size-fixed-p window t) `((fixed-width . t))))
(min-width-safe . ,(window-min-size window t 'safe)))
(window--state-get-1 window writable)))
(defvar window-state-put-list nil