diff options
| author | Martin Rudalics | 2017-08-19 10:55:04 +0200 |
|---|---|---|
| committer | Martin Rudalics | 2017-08-19 10:55:04 +0200 |
| commit | 8a9905e2f723d757f1a75d2b45855f7fb1074632 (patch) | |
| tree | ecd09fc606e35cbb5d3f4c14708b0a1318b6b24d /lisp | |
| parent | 82b05985ba55761c497810cf9e14fd530253a1b2 (diff) | |
| download | emacs-8a9905e2f723d757f1a75d2b45855f7fb1074632.tar.gz emacs-8a9905e2f723d757f1a75d2b45855f7fb1074632.zip | |
Fix two side window problems noted by Alex (Bug#27999)
* lisp/window.el (display-buffer-in-side-window): Fix doc-string
typo.
(delete-other-windows): Rename the `no-delete-other-window'
parameter to `no-delete-other-windows' (see the discussion in
Bug#27999 for the rationale of this change).
* doc/lispref/windows.texi (Deleting Windows)
(Frame Layouts with Side Windows, Window Parameters): Rename
`no-delete-other-window' to `no-delete-other-windows'.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/window.el | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/lisp/window.el b/lisp/window.el index f1c82c759d8..7aea9ae7399 100644 --- a/lisp/window.el +++ b/lisp/window.el | |||
| @@ -999,7 +999,7 @@ for displaying BUFFER, nil if no suitable window can be found. | |||
| 999 | This function installs the `window-side' and `window-slot' | 999 | This function installs the `window-side' and `window-slot' |
| 1000 | parameters and makes them persistent. It neither modifies ALIST | 1000 | parameters and makes them persistent. It neither modifies ALIST |
| 1001 | nor installs any other window parameters unless they have been | 1001 | nor installs any other window parameters unless they have been |
| 1002 | explicitly provided via a `window-parameter' entry in ALIST." | 1002 | explicitly provided via a `window-parameters' entry in ALIST." |
| 1003 | (let* ((side (or (cdr (assq 'side alist)) 'bottom)) | 1003 | (let* ((side (or (cdr (assq 'side alist)) 'bottom)) |
| 1004 | (slot (or (cdr (assq 'slot alist)) 0)) | 1004 | (slot (or (cdr (assq 'slot alist)) 0)) |
| 1005 | (left-or-right (memq side '(left right))) | 1005 | (left-or-right (memq side '(left right))) |
| @@ -4106,7 +4106,7 @@ Else, if WINDOW is part of an atomic window, call this function | |||
| 4106 | with the root of the atomic window as its argument. Signal an | 4106 | with the root of the atomic window as its argument. Signal an |
| 4107 | error if that root window is the root window of WINDOW's frame. | 4107 | error if that root window is the root window of WINDOW's frame. |
| 4108 | Also signal an error if WINDOW is a side window. Do not delete | 4108 | Also signal an error if WINDOW is a side window. Do not delete |
| 4109 | any window whose `no-delete-other-window' parameter is non-nil." | 4109 | any window whose `no-delete-other-windows' parameter is non-nil." |
| 4110 | (interactive) | 4110 | (interactive) |
| 4111 | (setq window (window-normalize-window window)) | 4111 | (setq window (window-normalize-window window)) |
| 4112 | (let* ((frame (window-frame window)) | 4112 | (let* ((frame (window-frame window)) |
| @@ -4137,17 +4137,17 @@ any window whose `no-delete-other-window' parameter is non-nil." | |||
| 4137 | 4137 | ||
| 4138 | (cond | 4138 | (cond |
| 4139 | ((or ignore-window-parameters | 4139 | ((or ignore-window-parameters |
| 4140 | (not (window-with-parameter 'no-delete-other-window nil frame))) | 4140 | (not (window-with-parameter 'no-delete-other-windows nil frame))) |
| 4141 | (setq main (frame-root-window frame))) | 4141 | (setq main (frame-root-window frame))) |
| 4142 | ((catch 'tag | 4142 | ((catch 'tag |
| 4143 | (walk-window-tree | 4143 | (walk-window-tree |
| 4144 | (lambda (other) | 4144 | (lambda (other) |
| 4145 | (when (or (and (window-parameter other 'window-side) | 4145 | (when (or (and (window-parameter other 'window-side) |
| 4146 | (not (window-parameter | 4146 | (not (window-parameter |
| 4147 | other 'no-delete-other-window))) | 4147 | other 'no-delete-other-windows))) |
| 4148 | (and (not (window-parameter other 'window-side)) | 4148 | (and (not (window-parameter other 'window-side)) |
| 4149 | (window-parameter | 4149 | (window-parameter |
| 4150 | other 'no-delete-other-window))) | 4150 | other 'no-delete-other-windows))) |
| 4151 | (throw 'tag nil)))) | 4151 | (throw 'tag nil)))) |
| 4152 | t) | 4152 | t) |
| 4153 | (setq main (window-main-window frame))) | 4153 | (setq main (window-main-window frame))) |
| @@ -4158,7 +4158,7 @@ any window whose `no-delete-other-window' parameter is non-nil." | |||
| 4158 | (when (and (window-live-p other) | 4158 | (when (and (window-live-p other) |
| 4159 | (not (eq other window)) | 4159 | (not (eq other window)) |
| 4160 | (not (window-parameter | 4160 | (not (window-parameter |
| 4161 | other 'no-delete-other-window)) | 4161 | other 'no-delete-other-windows)) |
| 4162 | ;; When WINDOW and the other window are part of the | 4162 | ;; When WINDOW and the other window are part of the |
| 4163 | ;; same atomic window, don't delete the other. | 4163 | ;; same atomic window, don't delete the other. |
| 4164 | (or (not atom-root) | 4164 | (or (not atom-root) |