diff options
| author | Martin Rudalics | 2012-09-30 12:44:43 +0200 |
|---|---|---|
| committer | Martin Rudalics | 2012-09-30 12:44:43 +0200 |
| commit | 1bc834133da819bb132a732b1797df7481f86a8b (patch) | |
| tree | fcfadf8f655fc2b413583a6a4cbe4b9d22f00967 | |
| parent | 0e8bc990346ed3d77915251b21ec04f7ed10dba3 (diff) | |
| download | emacs-1bc834133da819bb132a732b1797df7481f86a8b.tar.gz emacs-1bc834133da819bb132a732b1797df7481f86a8b.zip | |
Fix last fix of window--display-buffer.
| -rw-r--r-- | lisp/window.el | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/window.el b/lisp/window.el index 3f399bc39fb..811b1781b4c 100644 --- a/lisp/window.el +++ b/lisp/window.el | |||
| @@ -5191,7 +5191,7 @@ BUFFER and WINDOW are live." | |||
| 5191 | height)))) | 5191 | height)))) |
| 5192 | (delta (- new-height (window-total-size window)))) | 5192 | (delta (- new-height (window-total-size window)))) |
| 5193 | (cond | 5193 | (cond |
| 5194 | ((and (window-resizable-p window delta nil 'safe) | 5194 | ((and (window--resizable-p window delta nil 'safe) |
| 5195 | (window-combined-p window)) | 5195 | (window-combined-p window)) |
| 5196 | (window-resize window delta nil 'safe)) | 5196 | (window-resize window delta nil 'safe)) |
| 5197 | ((or (eq type 'frame) | 5197 | ((or (eq type 'frame) |
| @@ -5214,7 +5214,7 @@ BUFFER and WINDOW are live." | |||
| 5214 | width)))) | 5214 | width)))) |
| 5215 | (delta (- new-width (window-total-size window t)))) | 5215 | (delta (- new-width (window-total-size window t)))) |
| 5216 | (cond | 5216 | (cond |
| 5217 | ((and (window-resizable-p window delta t 'safe) | 5217 | ((and (window--resizable-p window delta t 'safe) |
| 5218 | (window-combined-p window t)) | 5218 | (window-combined-p window t)) |
| 5219 | (window-resize window delta t 'safe)) | 5219 | (window-resize window delta t 'safe)) |
| 5220 | ((or (eq type 'frame) | 5220 | ((or (eq type 'frame) |