summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
authorAlexander Gramiak <agrambot@gmail.com>2019-04-14 09:27:50 -0600
committerAlexander Gramiak <agrambot@gmail.com>2019-04-14 11:36:32 -0600
commite233dedde2e79b72ce158e087f29fb6d2ac8453a (patch)
tree434a6bc0f7431e9cf54dcd6cbc97413646e818cf /lisp
parent5ee5895f9b7b829783bc0f217095748076cc77e9 (diff)
downloademacs-e233dedde2e79b72ce158e087f29fb6d2ac8453a.tar.gz
* lisp/frame.el (frame--size-history): Fix infloop. (Bug#35272)
Diffstat (limited to 'lisp')
-rw-r--r--lisp/frame.el6
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."
(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))