mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-27 07:37:33 +00:00
Code Issues Releases Activity

* lisp/tab-bar.el: Check for minibuffer-depth in tab-bar-history-mode.

Browse Source 
* lisp/tab-bar.el (tab-bar-history--pre-change): Store also minibuffer-depth.
(tab-bar-history-change): Check stored minibuffer-depth for zero.
(tab-bar-history-mode): Use prefix -- for internal functions.
This commit is contained in:
Juri Linkov 2019-10-28 23:55:16 +02:00
parent 2aed0430c7
commit 4e3676726a
1 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
lisp/tab-bar.el
View File

@ -870,17 +870,23 @@ function `tab-bar-tab-name-function'."
(defvar tab-bar-history-forward (make-hash-table)
"History of forward changes in every tab per frame.")
(defvar tab-bar-history-pre-change nil
"Window configuration before the current command.")
(defvar tab-bar-history--pre-change nil
"Window configuration and minibuffer depth before the current command.")
(defun tab-bar-history-pre-change ()
(setq tab-bar-history-pre-change (current-window-configuration)))
(defun tab-bar-history--pre-change ()
(setq tab-bar-history--pre-change
(list (current-window-configuration)
(minibuffer-depth))))
(defun tab-bar-history-change ()
(defun tab-bar--history-change ()
(when (and (not tab-bar-history-omit)
tab-bar-history--pre-change
;; Entering the minibuffer
(zerop (nth 1 tab-bar-history--pre-change))
;; Exiting the minibuffer
(zerop (minibuffer-depth)))
(puthash (selected-frame)
(cons tab-bar-history-pre-change
(cons (nth 0 tab-bar-history--pre-change)
(gethash (selected-frame) tab-bar-history-back))
tab-bar-history-back))
(when tab-bar-history-omit
@ -934,10 +940,10 @@ function `tab-bar-tab-name-function'."
:ascent center))
tab-bar-forward-button))
(add-hook 'pre-command-hook 'tab-bar-history-pre-change)
(add-hook 'window-configuration-change-hook 'tab-bar-history-change))
(remove-hook 'pre-command-hook 'tab-bar-history-pre-change)
(remove-hook 'window-configuration-change-hook 'tab-bar-history-change)))
(add-hook 'pre-command-hook 'tab-bar-history--pre-change)
(add-hook 'window-configuration-change-hook 'tab-bar--history-change))
(remove-hook 'pre-command-hook 'tab-bar-history--pre-change)
(remove-hook 'window-configuration-change-hook 'tab-bar--history-change)))
;;; Short aliases