diff options
| author | Eli Zaretskii | 2011-09-01 20:51:42 +0300 |
|---|---|---|
| committer | Eli Zaretskii | 2011-09-01 20:51:42 +0300 |
| commit | e9d90883a2dd2009e77661ac5803d2bb36ed9b88 (patch) | |
| tree | 95092efd84bb5c74ae0f2bb2b6d5ea0f0d823256 | |
| parent | 437014c8adcd604bdec350015d89eab1d7c12ec2 (diff) | |
| download | emacs-e9d90883a2dd2009e77661ac5803d2bb36ed9b88.tar.gz emacs-e9d90883a2dd2009e77661ac5803d2bb36ed9b88.zip | |
lisp/window.el (frame-auto-delete, window-deletable-p): Doc fix.
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | 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 @@ | |||
| 1 | 2011-09-01 Eli Zaretskii <eliz@gnu.org> | ||
| 2 | |||
| 3 | * window.el (frame-auto-delete, window-deletable-p): Doc fix. | ||
| 4 | |||
| 1 | 2011-09-01 Chong Yidong <cyd@stupidchicken.com> | 5 | 2011-09-01 Chong Yidong <cyd@stupidchicken.com> |
| 2 | 6 | ||
| 3 | * window.el (display-buffer): Restore interactive spec. | 7 | * 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." | |||
| 2259 | 2259 | ||
| 2260 | ;;; Deleting windows. | 2260 | ;;; Deleting windows. |
| 2261 | (defcustom frame-auto-delete 'automatic | 2261 | (defcustom frame-auto-delete 'automatic |
| 2262 | "If non-nil, quitting a window can delete it's frame. | 2262 | "If non-nil, quitting a window can delete its frame. |
| 2263 | If this variable is nil, functions that quit a window never | 2263 | If this variable is nil, functions that quit a window never |
| 2264 | delete the associated frame. If this variable equals the symbol | 2264 | delete the associated frame. If this variable's value is the |
| 2265 | `automatic', a frame is deleted only if it the window is | 2265 | symbol `automatic', a frame is deleted only if the window is |
| 2266 | dedicated or was created by `display-buffer'. If this variable | 2266 | dedicated or was created by `display-buffer'. If this variable |
| 2267 | is t, a frame can be always deleted, even if it was created by | 2267 | is t, a frame can be always deleted, even if it was created by |
| 2268 | `make-frame-command'. Other values should not be used. | 2268 | `make-frame-command'. Other values should not be used. |
| @@ -2282,8 +2282,8 @@ variable are `switch-to-prev-buffer', `delete-windows-on', | |||
| 2282 | 2282 | ||
| 2283 | (defun window-deletable-p (&optional window) | 2283 | (defun window-deletable-p (&optional window) |
| 2284 | "Return t if WINDOW can be safely deleted from its frame. | 2284 | "Return t if WINDOW can be safely deleted from its frame. |
| 2285 | Return `frame' if deleting WINDOW should delete its frame | 2285 | Return `frame' if deleting WINDOW should also delete its |
| 2286 | instead." | 2286 | frame." |
| 2287 | (setq window (window-normalize-any-window window)) | 2287 | (setq window (window-normalize-any-window window)) |
| 2288 | (unless ignore-window-parameters | 2288 | (unless ignore-window-parameters |
| 2289 | ;; Handle atomicity. | 2289 | ;; Handle atomicity. |
| @@ -2304,7 +2304,7 @@ instead." | |||
| 2304 | (other-visible-frames-p frame)) | 2304 | (other-visible-frames-p frame)) |
| 2305 | ;; WINDOW is the root window of its frame. Return `frame' but | 2305 | ;; WINDOW is the root window of its frame. Return `frame' but |
| 2306 | ;; only if WINDOW is (1) either dedicated or quit-restore's car | 2306 | ;; only if WINDOW is (1) either dedicated or quit-restore's car |
| 2307 | ;; is new-frame and the window still displays the same buffer | 2307 | ;; is `new-frame' and the window still displays the same buffer |
| 2308 | ;; and (2) there are other frames left. | 2308 | ;; and (2) there are other frames left. |
| 2309 | 'frame)) | 2309 | 'frame)) |
| 2310 | ((and (not ignore-window-parameters) | 2310 | ((and (not ignore-window-parameters) |