diff options
| author | Alexander Gramiak <agrambot@gmail.com> | 2019-04-14 09:27:50 -0600 |
|---|---|---|
| committer | Alexander Gramiak <agrambot@gmail.com> | 2019-04-14 15:52:07 -0600 |
| commit | e40f39bec34feeec893fb66625f19cc4663cd217 (patch) | |
| tree | fd5e5d837dd199bff248a1f782588ee2204bd1d0 /lisp/frame.el | |
| parent | 266c62290f5a0843555d2a18878a58395a6fd05f (diff) | |
| download | emacs-e40f39bec34feeec893fb66625f19cc4663cd217.tar.gz | |
Backport: * lisp/frame.el (frame--size-history): Fix infloop. (Bug#35272)
Diffstat (limited to 'lisp/frame.el')
| -rw-r--r-- | lisp/frame.el | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lisp/frame.el b/lisp/frame.el index a0e62e1d69d..30f6ca91ba6 100644 --- a/lisp/frame.el +++ b/lisp/frame.el @@ -1446,14 +1446,16 @@ selected frame." (with-current-buffer (get-buffer-create "*frame-size-history*") (erase-buffer) (insert (format "Frame size history of %s\n" frame)) - (while (listp (setq entry (pop history))) + (while (consp (setq entry (pop history))) (when (eq (car entry) frame) (pop entry) (insert (format "%s" (pop entry))) (move-to-column 24 t) (while entry (insert (format " %s" (pop entry)))) - (insert "\n")))))) + (insert "\n"))) + (unless frame-size-history + (insert "Frame size history is nil.\n"))))) (declare-function x-frame-edges "xfns.c" (&optional frame type)) (declare-function w32-frame-edges "w32fns.c" (&optional frame type)) |