diff options
| author | Glenn Morris | 2019-06-11 08:38:34 -0700 |
|---|---|---|
| committer | Glenn Morris | 2019-06-11 08:38:34 -0700 |
| commit | 1903e9964f2fd16b604f4ef50390dfa9b4d90a9a (patch) | |
| tree | 183e546ecafaf4c72049dc7eee47b3962661477b /lisp/window.el | |
| parent | e545d612df8111d2dc76c115685ccd3f426ee2ee (diff) | |
| parent | 5ca093d2814fe5574c720338fc64cba44357f9b3 (diff) | |
| download | emacs-1903e9964f2fd16b604f4ef50390dfa9b4d90a9a.tar.gz emacs-1903e9964f2fd16b604f4ef50390dfa9b4d90a9a.zip | |
Merge from origin/emacs-26
5ca093d (origin/emacs-26) Fix doc of 'display-buffer-in-previous-wind...
add2cac lisp/*.el: Minor docstring fixes
Diffstat (limited to 'lisp/window.el')
| -rw-r--r-- | lisp/window.el | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/lisp/window.el b/lisp/window.el index 69b1299dbda..7117d4aacd6 100644 --- a/lisp/window.el +++ b/lisp/window.el | |||
| @@ -7783,8 +7783,11 @@ selected frame if `display-buffer-reuse-frames' and | |||
| 7783 | terminal if either of those variables is non-nil. | 7783 | terminal if either of those variables is non-nil. |
| 7784 | 7784 | ||
| 7785 | If ALIST has a `previous-window' entry, the window specified by | 7785 | If ALIST has a `previous-window' entry, the window specified by |
| 7786 | that entry will override any other window found by the methods | 7786 | that entry may override any other window found by the methods |
| 7787 | above, even if that window never showed BUFFER before." | 7787 | above, even if that window never showed BUFFER before. |
| 7788 | |||
| 7789 | Avoid using the selected window if another eligible window has | ||
| 7790 | shown BUFFER before." | ||
| 7788 | (let* ((alist-entry (assq 'reusable-frames alist)) | 7791 | (let* ((alist-entry (assq 'reusable-frames alist)) |
| 7789 | (inhibit-same-window | 7792 | (inhibit-same-window |
| 7790 | (cdr (assq 'inhibit-same-window alist))) | 7793 | (cdr (assq 'inhibit-same-window alist))) |