diff options
| author | Stefan Monnier | 2008-11-17 04:53:55 +0000 |
|---|---|---|
| committer | Stefan Monnier | 2008-11-17 04:53:55 +0000 |
| commit | 4afba8195e3a34c4f74fe99e1adaeb1dfe2bba96 (patch) | |
| tree | ba68fc709966cbd954a0692da586bab1af8b1834 | |
| parent | a6387c8d173da129d8a703705145f35072d53936 (diff) | |
| download | emacs-4afba8195e3a34c4f74fe99e1adaeb1dfe2bba96.tar.gz emacs-4afba8195e3a34c4f74fe99e1adaeb1dfe2bba96.zip | |
(window--frame-usable-p): Allow use for soft-dedication.
| -rw-r--r-- | lisp/ChangeLog | 12 | ||||
| -rw-r--r-- | lisp/window.el | 7 |
2 files changed, 12 insertions, 7 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 7224e4c0b56..163751cd8ec 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2008-11-17 Stefan Monnier <monnier@iro.umontreal.ca> | ||
| 2 | |||
| 3 | * window.el (window--frame-usable-p): Allow use for soft-dedication. | ||
| 4 | |||
| 1 | 2008-11-17 Juanma Barranquero <lekktu@gmail.com> | 5 | 2008-11-17 Juanma Barranquero <lekktu@gmail.com> |
| 2 | 6 | ||
| 3 | * emulation/viper-cmd.el (viper-harness-minor-mode): Fix docstring typo. | 7 | * emulation/viper-cmd.el (viper-harness-minor-mode): Fix docstring typo. |
| @@ -17,8 +21,8 @@ | |||
| 17 | `isearch-filter-invisible'. Doc fix. | 21 | `isearch-filter-invisible'. Doc fix. |
| 18 | (isearch-filter-invisible): Rename from | 22 | (isearch-filter-invisible): Rename from |
| 19 | `isearch-success-function-default'. Doc fix. | 23 | `isearch-success-function-default'. Doc fix. |
| 20 | (isearch-search, isearch-lazy-highlight-search): Rename | 24 | (isearch-search, isearch-lazy-highlight-search): |
| 21 | `isearch-success-function' to `isearch-filter-predicate'. | 25 | Rename `isearch-success-function' to `isearch-filter-predicate'. |
| 22 | 26 | ||
| 23 | * dired-aux.el (dired-isearch-filter-predicate-orig): Rename from | 27 | * dired-aux.el (dired-isearch-filter-predicate-orig): Rename from |
| 24 | `dired-isearch-orig-success-function'. | 28 | `dired-isearch-orig-success-function'. |
| @@ -28,8 +32,8 @@ | |||
| 28 | (dired-isearch-filter-filenames): Rename from | 32 | (dired-isearch-filter-filenames): Rename from |
| 29 | `dired-isearch-success-function'. | 33 | `dired-isearch-success-function'. |
| 30 | 34 | ||
| 31 | * info.el (Info-search, Info-mode): Rename | 35 | * info.el (Info-search, Info-mode): |
| 32 | `isearch-success-function' to `isearch-filter-predicate'. | 36 | Rename `isearch-success-function' to `isearch-filter-predicate'. |
| 33 | (Info-isearch-filter-predicate): Rename from | 37 | (Info-isearch-filter-predicate): Rename from |
| 34 | `Info-search-success-function'. | 38 | `Info-search-success-function'. |
| 35 | 39 | ||
diff --git a/lisp/window.el b/lisp/window.el index 295f528ecc2..2dece4b25fe 100644 --- a/lisp/window.el +++ b/lisp/window.el | |||
| @@ -869,9 +869,10 @@ by `split-window' (or `split-window-preferred-function')." | |||
| 869 | ;; `frame-root-window' may be an internal window which is considered | 869 | ;; `frame-root-window' may be an internal window which is considered |
| 870 | ;; "dead" by `window-live-p'. Hence if `window' is not live we | 870 | ;; "dead" by `window-live-p'. Hence if `window' is not live we |
| 871 | ;; implicitly know that `frame' has a visible window we can use. | 871 | ;; implicitly know that `frame' has a visible window we can use. |
| 872 | (when (or (not (window-live-p window)) | 872 | (unless (and (window-live-p window) |
| 873 | (and (not (window-minibuffer-p window)) | 873 | (or (window-minibuffer-p window) |
| 874 | (not (window-dedicated-p window)))) | 874 | ;; If the window is soft-dedicated, the frame is usable. |
| 875 | (eq t (window-dedicated-p window)))) | ||
| 875 | frame)))) | 876 | frame)))) |
| 876 | 877 | ||
| 877 | (defcustom even-window-heights t | 878 | (defcustom even-window-heights t |