diff options
| author | Alexander Gramiak | 2019-04-14 09:27:50 -0600 |
|---|---|---|
| committer | Alexander Gramiak | 2019-04-14 11:36:32 -0600 |
| commit | e233dedde2e79b72ce158e087f29fb6d2ac8453a (patch) | |
| tree | 434a6bc0f7431e9cf54dcd6cbc97413646e818cf | |
| parent | 5ee5895f9b7b829783bc0f217095748076cc77e9 (diff) | |
| download | emacs-e233dedde2e79b72ce158e087f29fb6d2ac8453a.tar.gz emacs-e233dedde2e79b72ce158e087f29fb6d2ac8453a.zip | |
* lisp/frame.el (frame--size-history): Fix infloop. (Bug#35272)
| -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 b5c936a51eb..539a0f4dfc7 100644 --- a/lisp/frame.el +++ b/lisp/frame.el | |||
| @@ -1610,14 +1610,16 @@ selected frame." | |||
| 1610 | (with-current-buffer (get-buffer-create "*frame-size-history*") | 1610 | (with-current-buffer (get-buffer-create "*frame-size-history*") |
| 1611 | (erase-buffer) | 1611 | (erase-buffer) |
| 1612 | (insert (format "Frame size history of %s\n" frame)) | 1612 | (insert (format "Frame size history of %s\n" frame)) |
| 1613 | (while (listp (setq entry (pop history))) | 1613 | (while (consp (setq entry (pop history))) |
| 1614 | (when (eq (car entry) frame) | 1614 | (when (eq (car entry) frame) |
| 1615 | (pop entry) | 1615 | (pop entry) |
| 1616 | (insert (format "%s" (pop entry))) | 1616 | (insert (format "%s" (pop entry))) |
| 1617 | (move-to-column 24 t) | 1617 | (move-to-column 24 t) |
| 1618 | (while entry | 1618 | (while entry |
| 1619 | (insert (format " %s" (pop entry)))) | 1619 | (insert (format " %s" (pop entry)))) |
| 1620 | (insert "\n")))))) | 1620 | (insert "\n"))) |
| 1621 | (unless frame-size-history | ||
| 1622 | (insert "Frame size history is nil.\n"))))) | ||
| 1621 | 1623 | ||
| 1622 | (declare-function x-frame-edges "xfns.c" (&optional frame type)) | 1624 | (declare-function x-frame-edges "xfns.c" (&optional frame type)) |
| 1623 | (declare-function w32-frame-edges "w32fns.c" (&optional frame type)) | 1625 | (declare-function w32-frame-edges "w32fns.c" (&optional frame type)) |