procyberian/emacs
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* lisp/windmove.el (windmove-display-in-direction): Support consecutive calls

Browse source 
Remember action and delete it from display-buffer-overriding-action afterwards
This commit is contained in:
Juri Linkov 2019-04-25 00:40:27 +03:00
parent 4eb7f9ef59
commit 62072bad41
1 changed files with 16 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

31
lisp/windmove.el
View file

@ -596,12 +596,25 @@ When `switch-to-buffer-obey-display-actions' is non-nil,
(old-window (or (minibuffer-selected-window) (selected-window)))
(new-window)
(minibuffer-depth (minibuffer-depth))
(action display-buffer-overriding-action)
(action (lambda (buffer alist)
(unless (> (minibuffer-depth) minibuffer-depth)
(let ((window (if (eq dir 'same-window)
(selected-window)
(window-in-direction
dir nil nil
(and arg (prefix-numeric-value arg))
windmove-wrap-around)))
(type 'reuse))
(unless window
(setq window (split-window nil nil dir) type 'window))
(setq new-window (window--display-buffer buffer window
type alist))))))
(command this-command)
(clearfun (make-symbol "clear-display-buffer-overriding-action"))
(exitfun
(lambda ()
(setq display-buffer-overriding-action action)
(setq display-buffer-overriding-action
(delq action display-buffer-overriding-action))
(when (window-live-p (if no-select old-window new-window))
(select-window (if no-select old-window new-window)))
(remove-hook 'post-command-hook clearfun))))
@ -616,19 +629,7 @@ When `switch-to-buffer-obey-display-actions' is non-nil,
(eq this-command command))
(funcall exitfun))))
(add-hook 'post-command-hook clearfun)
(push (lambda (buffer alist)
(unless (> (minibuffer-depth) minibuffer-depth)
(let ((window (if (eq dir 'same-window)
(selected-window)
(window-in-direction
dir nil nil
(and arg (prefix-numeric-value arg))
windmove-wrap-around)))
(type 'reuse))
(unless window
(setq window (split-window nil nil dir) type 'window))
(setq new-window (window--display-buffer buffer window type alist)))))
display-buffer-overriding-action)
(push action display-buffer-overriding-action)
(message "[display-%s]" dir)))
;;;###autoload