diff options
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/window.el | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index aae09fda38f..16206e2b6e1 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2015-03-03 Martin Rudalics <rudalics@gmx.at> | ||
| 2 | |||
| 3 | * window.el (window--dump-frame): For pixel height return total | ||
| 4 | number of frame's lines. | ||
| 5 | |||
| 1 | 2015-03-03 Daniel Colascione <dancol@dancol.org> | 6 | 2015-03-03 Daniel Colascione <dancol@dancol.org> |
| 2 | 7 | ||
| 3 | * emacs-lisp/cl-macs.el (cl-iter-defun): Add cl-iter-defun. | 8 | * emacs-lisp/cl-macs.el (cl-iter-defun): Add cl-iter-defun. |
diff --git a/lisp/window.el b/lisp/window.el index abc60063ab9..cc8a7fc402f 100644 --- a/lisp/window.el +++ b/lisp/window.el | |||
| @@ -1160,7 +1160,7 @@ dumping to it." | |||
| 1160 | (insert | 1160 | (insert |
| 1161 | (format "frame pixel: %s x %s cols/lines: %s x %s units: %s x %s\n" | 1161 | (format "frame pixel: %s x %s cols/lines: %s x %s units: %s x %s\n" |
| 1162 | (frame-pixel-width frame) (frame-pixel-height frame) | 1162 | (frame-pixel-width frame) (frame-pixel-height frame) |
| 1163 | (frame-total-cols frame) (frame-text-lines frame) ; (frame-total-lines frame) | 1163 | (frame-total-cols frame) (frame-total-lines frame) |
| 1164 | (frame-char-width frame) (frame-char-height frame)) | 1164 | (frame-char-width frame) (frame-char-height frame)) |
| 1165 | (format "frame text pixel: %s x %s cols/lines: %s x %s\n" | 1165 | (format "frame text pixel: %s x %s cols/lines: %s x %s\n" |
| 1166 | (frame-text-width frame) (frame-text-height frame) | 1166 | (frame-text-width frame) (frame-text-height frame) |