Mercurial > emacs
comparison lisp/window.el @ 90185:5b029ff3b08d
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-55
Merge from emacs--cvs-trunk--0
Patches applied:
* emacs--cvs-trunk--0 (patch 320-323)
- Update from CVS
author | Miles Bader <miles@gnu.org> |
---|---|
date | Thu, 26 May 2005 05:42:19 +0000 |
parents | 08185296b491 bf8ebb1d0b0b |
children | a1b34dec1104 |
comparison
equal
deleted
inserted
replaced
90184:9e5e2f01c7ab | 90185:5b029ff3b08d |
---|---|
541 If WINDOW is omitted or nil, it defaults to the selected window. | 541 If WINDOW is omitted or nil, it defaults to the selected window. |
542 Do not shrink to less than `window-min-height' lines. | 542 Do not shrink to less than `window-min-height' lines. |
543 Do nothing if the buffer contains more lines than the present window height, | 543 Do nothing if the buffer contains more lines than the present window height, |
544 or if some of the window's contents are scrolled out of view, | 544 or if some of the window's contents are scrolled out of view, |
545 or if shrinking this window would also shrink another window. | 545 or if shrinking this window would also shrink another window. |
546 or if the window is the only window of its frame. | 546 or if the window is the only window of its frame." |
547 Return non-nil if the window was shrunk." | |
548 (interactive) | 547 (interactive) |
549 (when (null window) | 548 (when (null window) |
550 (setq window (selected-window))) | 549 (setq window (selected-window))) |
551 (let* ((frame (window-frame window)) | 550 (let* ((frame (window-frame window)) |
552 (mini (frame-parameter frame 'minibuffer)) | 551 (mini (frame-parameter frame 'minibuffer)) |
581 (delete-window)) | 580 (delete-window)) |
582 (remove-hook 'kill-buffer-hook delete-window-hook t)))) | 581 (remove-hook 'kill-buffer-hook delete-window-hook t)))) |
583 | 582 |
584 (defun quit-window (&optional kill window) | 583 (defun quit-window (&optional kill window) |
585 "Quit the current buffer. Bury it, and maybe delete the selected frame. | 584 "Quit the current buffer. Bury it, and maybe delete the selected frame. |
586 \(The frame is deleted if it is contains a dedicated window for the buffer.) | 585 \(The frame is deleted if it contains a dedicated window for the buffer.) |
587 With a prefix argument, kill the buffer instead. | 586 With a prefix argument, kill the buffer instead. |
588 | 587 |
589 Noninteractively, if KILL is non-nil, then kill the current buffer, | 588 Noninteractively, if KILL is non-nil, then kill the current buffer, |
590 otherwise bury it. | 589 otherwise bury it. |
591 | 590 |