From e9d90883a2dd2009e77661ac5803d2bb36ed9b88 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Thu, 1 Sep 2011 20:51:42 +0300 Subject: [PATCH] lisp/window.el (frame-auto-delete, window-deletable-p): Doc fix. --- lisp/ChangeLog | 4 ++++ lisp/window.el | 12 ++++++------ 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index e51cdb9137a..a306f697c60 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2011-09-01 Eli Zaretskii + + * window.el (frame-auto-delete, window-deletable-p): Doc fix. + 2011-09-01 Chong Yidong * window.el (display-buffer): Restore interactive spec. diff --git a/lisp/window.el b/lisp/window.el index 11f4920c24f..277b1fd5c09 100644 --- a/lisp/window.el +++ b/lisp/window.el @@ -2259,10 +2259,10 @@ and no others." ;;; Deleting windows. (defcustom frame-auto-delete 'automatic - "If non-nil, quitting a window can delete it's frame. + "If non-nil, quitting a window can delete its frame. If this variable is nil, functions that quit a window never -delete the associated frame. If this variable equals the symbol -`automatic', a frame is deleted only if it the window is +delete the associated frame. If this variable's value is the +symbol `automatic', a frame is deleted only if the window is dedicated or was created by `display-buffer'. If this variable is t, a frame can be always deleted, even if it was created by `make-frame-command'. Other values should not be used. @@ -2282,8 +2282,8 @@ variable are `switch-to-prev-buffer', `delete-windows-on', (defun window-deletable-p (&optional window) "Return t if WINDOW can be safely deleted from its frame. -Return `frame' if deleting WINDOW should delete its frame -instead." +Return `frame' if deleting WINDOW should also delete its +frame." (setq window (window-normalize-any-window window)) (unless ignore-window-parameters ;; Handle atomicity. @@ -2304,7 +2304,7 @@ instead." (other-visible-frames-p frame)) ;; WINDOW is the root window of its frame. Return `frame' but ;; only if WINDOW is (1) either dedicated or quit-restore's car - ;; is new-frame and the window still displays the same buffer + ;; is `new-frame' and the window still displays the same buffer ;; and (2) there are other frames left. 'frame)) ((and (not ignore-window-parameters) -- 2.39.2