diff options
| author | Juri Linkov <juri@linkov.net> | 2020-11-29 21:48:01 +0200 |
|---|---|---|
| committer | Juri Linkov <juri@linkov.net> | 2020-11-29 21:48:01 +0200 |
| commit | 6355fa518330bc97b31d77147f77c38b39563820 (patch) | |
| tree | 3051a225766ac941d6d7660acf097eec7a6a649c /lisp/windmove.el | |
| parent | a91ca6560cf51c6b0bb94df2962077769d0f8965 (diff) | |
| download | emacs-6355fa518330bc97b31d77147f77c38b39563820.tar.gz | |
Fix MINIBUF 'nomini' arg for windmove/window-in-direction (bug#44932)
* lisp/windmove.el (windmove-display-in-direction)
(windmove-delete-in-direction, windmove-swap-states-in-direction):
Add 'nomini' as MINIBUF arg of window-in-direction.
* lisp/window.el (window-in-direction): Rename arg MINI to MINIBUF.
Update docstring from walk-window-tree.
Send MINIBUF arg to walk-window-tree unchanged.
Diffstat (limited to 'lisp/windmove.el')
| -rw-r--r-- | lisp/windmove.el | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lisp/windmove.el b/lisp/windmove.el index 65579600640..5db13cf6b30 100644 --- a/lisp/windmove.el +++ b/lisp/windmove.el @@ -485,7 +485,7 @@ When `switch-to-buffer-obey-display-actions' is non-nil, (t (window-in-direction dir nil nil (and arg (prefix-numeric-value arg)) - windmove-wrap-around))))) + windmove-wrap-around 'nomini))))) (unless window (setq window (split-window nil nil dir) type 'window)) (cons window type))) @@ -569,7 +569,7 @@ select the window at direction DIR. When `windmove-wrap-around' is non-nil, takes the window from the opposite side of the frame." (let ((other-window (window-in-direction dir nil nil arg - windmove-wrap-around t))) + windmove-wrap-around 'nomini))) (cond ((null other-window) (user-error "No window %s from selected window" dir)) (t @@ -637,7 +637,7 @@ a single modifier. Default value of PREFIX is `C-x' and MODIFIERS is `shift'." When `windmove-wrap-around' is non-nil, takes the window from the opposite side of the frame." (let ((other-window (window-in-direction dir nil nil nil - windmove-wrap-around t))) + windmove-wrap-around 'nomini))) (cond ((or (null other-window) (window-minibuffer-p other-window)) (user-error "No window %s from selected window" dir)) (t |