diff options
| author | Juri Linkov | 2019-11-07 01:01:12 +0200 |
|---|---|---|
| committer | Juri Linkov | 2019-11-07 01:01:12 +0200 |
| commit | 528485d0172f00e5f0c8ea548013a49964be501b (patch) | |
| tree | a749dc9e9e13ac493b6bf71b90e72acecdf708f0 | |
| parent | f5f40af1daba7dd2b9a979cc6c414ee7b44a6d8c (diff) | |
| download | emacs-528485d0172f00e5f0c8ea548013a49964be501b.tar.gz emacs-528485d0172f00e5f0c8ea548013a49964be501b.zip | |
* lisp/tab-bar.el (tab-bar-history-old): Rename from tab-bar-history-current.
(tab-bar-history-old-minibuffer-depth):
Rename from tab-bar-history--minibuffer-depth.
| -rw-r--r-- | lisp/tab-bar.el | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/lisp/tab-bar.el b/lisp/tab-bar.el index 8777e20807a..e915930c274 100644 --- a/lisp/tab-bar.el +++ b/lisp/tab-bar.el | |||
| @@ -923,27 +923,27 @@ function `tab-bar-tab-name-function'." | |||
| 923 | (defvar tab-bar-history-forward (make-hash-table) | 923 | (defvar tab-bar-history-forward (make-hash-table) |
| 924 | "History of forward changes in every tab per frame.") | 924 | "History of forward changes in every tab per frame.") |
| 925 | 925 | ||
| 926 | (defvar tab-bar-history-current nil | 926 | (defvar tab-bar-history-old nil |
| 927 | "Window configuration before the current command.") | 927 | "Window configuration before the current command.") |
| 928 | 928 | ||
| 929 | (defvar tab-bar-history--minibuffer-depth 0 | 929 | (defvar tab-bar-history-old-minibuffer-depth 0 |
| 930 | "Minibuffer depth before the current command.") | 930 | "Minibuffer depth before the current command.") |
| 931 | 931 | ||
| 932 | (defun tab-bar-history--pre-change () | 932 | (defun tab-bar-history--pre-change () |
| 933 | (setq tab-bar-history--minibuffer-depth (minibuffer-depth)) | 933 | (setq tab-bar-history-old-minibuffer-depth (minibuffer-depth)) |
| 934 | ;; Store wc before possibly entering the minibuffer | 934 | ;; Store wc before possibly entering the minibuffer |
| 935 | (when (zerop tab-bar-history--minibuffer-depth) | 935 | (when (zerop tab-bar-history-old-minibuffer-depth) |
| 936 | (setq tab-bar-history-current | 936 | (setq tab-bar-history-old |
| 937 | `((wc . ,(current-window-configuration)) | 937 | `((wc . ,(current-window-configuration)) |
| 938 | (wc-point . ,(point-marker)))))) | 938 | (wc-point . ,(point-marker)))))) |
| 939 | 939 | ||
| 940 | (defun tab-bar--history-change () | 940 | (defun tab-bar--history-change () |
| 941 | (when (and (not tab-bar-history-omit) | 941 | (when (and (not tab-bar-history-omit) |
| 942 | tab-bar-history-current | 942 | tab-bar-history-old |
| 943 | ;; Store wc before possibly entering the minibuffer | 943 | ;; Store wc before possibly entering the minibuffer |
| 944 | (zerop tab-bar-history--minibuffer-depth)) | 944 | (zerop tab-bar-history-old-minibuffer-depth)) |
| 945 | (puthash (selected-frame) | 945 | (puthash (selected-frame) |
| 946 | (seq-take (cons tab-bar-history-current | 946 | (seq-take (cons tab-bar-history-old |
| 947 | (gethash (selected-frame) tab-bar-history-back)) | 947 | (gethash (selected-frame) tab-bar-history-back)) |
| 948 | tab-bar-history-limit) | 948 | tab-bar-history-limit) |
| 949 | tab-bar-history-back)) | 949 | tab-bar-history-back)) |
| @@ -959,7 +959,7 @@ function `tab-bar-tab-name-function'." | |||
| 959 | (if (window-configuration-p wc) | 959 | (if (window-configuration-p wc) |
| 960 | (progn | 960 | (progn |
| 961 | (puthash (selected-frame) | 961 | (puthash (selected-frame) |
| 962 | (cons tab-bar-history-current | 962 | (cons tab-bar-history-old |
| 963 | (gethash (selected-frame) tab-bar-history-forward)) | 963 | (gethash (selected-frame) tab-bar-history-forward)) |
| 964 | tab-bar-history-forward) | 964 | tab-bar-history-forward) |
| 965 | (set-window-configuration wc) | 965 | (set-window-configuration wc) |
| @@ -976,7 +976,7 @@ function `tab-bar-tab-name-function'." | |||
| 976 | (if (window-configuration-p wc) | 976 | (if (window-configuration-p wc) |
| 977 | (progn | 977 | (progn |
| 978 | (puthash (selected-frame) | 978 | (puthash (selected-frame) |
| 979 | (cons tab-bar-history-current | 979 | (cons tab-bar-history-old |
| 980 | (gethash (selected-frame) tab-bar-history-back)) | 980 | (gethash (selected-frame) tab-bar-history-back)) |
| 981 | tab-bar-history-back) | 981 | tab-bar-history-back) |
| 982 | (set-window-configuration wc) | 982 | (set-window-configuration wc) |