diff options
| author | Juri Linkov | 2019-10-01 23:15:03 +0300 |
|---|---|---|
| committer | Juri Linkov | 2019-10-01 23:15:03 +0300 |
| commit | 2698d3dba2e9858b026ed127d4de3f86810a5ef3 (patch) | |
| tree | 8e9b8f194cfcad8af83a4174a0105bbc691f06d6 /lisp/window.el | |
| parent | 25f45d710e91a7c1049f056ff27bc3e6968f5624 (diff) | |
| parent | 3f981a0a89bca47a207fb362485f07e7322bb145 (diff) | |
| download | emacs-2698d3dba2e9858b026ed127d4de3f86810a5ef3.tar.gz emacs-2698d3dba2e9858b026ed127d4de3f86810a5ef3.zip | |
Merge branch 'feature/tabs'
Diffstat (limited to 'lisp/window.el')
| -rw-r--r-- | lisp/window.el | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/lisp/window.el b/lisp/window.el index 620eacdd290..d93ec0add67 100644 --- a/lisp/window.el +++ b/lisp/window.el | |||
| @@ -1419,7 +1419,10 @@ dumping to it." | |||
| 1419 | (format "frame text pixel: %s x %s cols/lines: %s x %s\n" | 1419 | (format "frame text pixel: %s x %s cols/lines: %s x %s\n" |
| 1420 | (frame-text-width frame) (frame-text-height frame) | 1420 | (frame-text-width frame) (frame-text-height frame) |
| 1421 | (frame-text-cols frame) (frame-text-lines frame)) | 1421 | (frame-text-cols frame) (frame-text-lines frame)) |
| 1422 | (format "tool: %s scroll: %s/%s fringe: %s border: %s right: %s bottom: %s\n\n" | 1422 | (format "tab: %s tool: %s scroll: %s/%s fringe: %s border: %s right: %s bottom: %s\n\n" |
| 1423 | (if (fboundp 'tab-bar-height) | ||
| 1424 | (tab-bar-height frame t) | ||
| 1425 | "0") | ||
| 1423 | (if (fboundp 'tool-bar-height) | 1426 | (if (fboundp 'tool-bar-height) |
| 1424 | (tool-bar-height frame t) | 1427 | (tool-bar-height frame t) |
| 1425 | "0") | 1428 | "0") |