Mercurial > hg > xemacs-beta
comparison lisp/window-xemacs.el @ 1576:bd921b813d33
[xemacs-hg @ 2003-07-17 14:41:23 by james]
Follow first-hchild and first-vchild links even when next-child is nil.
author | james |
---|---|
date | Thu, 17 Jul 2003 14:41:24 +0000 |
parents | e04cd2f562b7 |
children | c5f86842283a |
comparison
equal
deleted
inserted
replaced
1575:e0ca0b9b1a35 | 1576:bd921b813d33 |
---|---|
343 ((window-first-vchild window) | 343 ((window-first-vchild window) |
344 (window-reduce-to-one (window-first-vchild window))))) | 344 (window-reduce-to-one (window-first-vchild window))))) |
345 | 345 |
346 (defun restore-saved-window (configuration window saved-window direction) | 346 (defun restore-saved-window (configuration window saved-window direction) |
347 "Within CONFIGURATION, restore WINDOW to the state of SAVED-WINDOW." | 347 "Within CONFIGURATION, restore WINDOW to the state of SAVED-WINDOW." |
348 (if (saved-window-next-child saved-window) | 348 (and (saved-window-next-child saved-window) |
349 (progn | 349 (not (saved-window-minibufferp (saved-window-next-child saved-window))) |
350 (if (not (saved-window-minibufferp (saved-window-next-child saved-window))) | 350 (progn |
351 (progn | 351 (cond ((eq direction 'vertical) |
352 (cond ((eq direction 'vertical) | 352 (split-window window nil nil)) |
353 (split-window window nil nil)) | 353 ((eq direction 'horizontal) |
354 ((eq direction 'horizontal) | 354 (split-window window nil t))) |
355 (split-window window nil t))) | 355 (restore-saved-window configuration |
356 (restore-saved-window configuration | 356 (window-next-child window) |
357 (window-next-child window) | 357 (saved-window-next-child saved-window) |
358 (saved-window-next-child saved-window) | 358 direction))) |
359 direction))) | 359 |
360 | 360 (if (saved-window-first-hchild saved-window) |
361 (if (saved-window-first-hchild saved-window) | 361 (restore-saved-window configuration |
362 (restore-saved-window configuration | 362 window |
363 window | 363 (saved-window-first-hchild saved-window) |
364 (saved-window-first-hchild saved-window) | 364 'horizontal)) |
365 'horizontal)) | 365 (if (saved-window-first-vchild saved-window) |
366 (if (saved-window-first-vchild saved-window) | 366 (restore-saved-window configuration |
367 (restore-saved-window configuration | 367 window |
368 window | 368 (saved-window-first-vchild saved-window) |
369 (saved-window-first-vchild saved-window) | 369 'vertical)) |
370 'vertical)))) | |
371 | 370 |
372 (if (not (saved-window-minibufferp saved-window)) | 371 (if (not (saved-window-minibufferp saved-window)) |
373 (restore-saved-window-parameters configuration window saved-window))) | 372 (restore-saved-window-parameters configuration window saved-window))) |
374 | 373 |
375 (defun restore-saved-window-parameters (configuration window saved-window) | 374 (defun restore-saved-window-parameters (configuration window saved-window) |