diff options
| -rw-r--r-- | lisp/frameset.el | 25 |
1 files changed, 10 insertions, 15 deletions
diff --git a/lisp/frameset.el b/lisp/frameset.el index 0e3363d7ae3..0d7e8025abd 100644 --- a/lisp/frameset.el +++ b/lisp/frameset.el | |||
| @@ -800,22 +800,17 @@ Internal use only." | |||
| 800 | (cons nil | 800 | (cons nil |
| 801 | (and mb-frame | 801 | (and mb-frame |
| 802 | (frameset-frame-id mb-frame))))))))) | 802 | (frameset-frame-id mb-frame))))))))) |
| 803 | ;; Now store text-pixel width and height if it differs from the calculated | 803 | ;; Now store text-pixel width and height if `frame-resize-pixelwise' |
| 804 | ;; width and height and the frame is not fullscreen. | 804 | ;; is set. (Bug#30141) |
| 805 | (dolist (frame frame-list) | 805 | (dolist (frame frame-list) |
| 806 | (unless (frame-parameter frame 'fullscreen) | 806 | (when (and frame-resize-pixelwise |
| 807 | (unless (eq (* (frame-parameter frame 'width) | 807 | (not (frame-parameter frame 'fullscreen))) |
| 808 | (frame-char-width frame)) | 808 | (set-frame-parameter |
| 809 | (frame-text-width frame)) | 809 | frame 'frameset--text-pixel-width |
| 810 | (set-frame-parameter | 810 | (frame-text-width frame)) |
| 811 | frame 'frameset--text-pixel-width | 811 | (set-frame-parameter |
| 812 | (frame-text-width frame))) | 812 | frame 'frameset--text-pixel-height |
| 813 | (unless (eq (* (frame-parameter frame 'height) | 813 | (frame-text-height frame))))) |
| 814 | (frame-char-height frame)) | ||
| 815 | (frame-text-height frame)) | ||
| 816 | (set-frame-parameter | ||
| 817 | frame 'frameset--text-pixel-height | ||
| 818 | (frame-text-height frame)))))) | ||
| 819 | 814 | ||
| 820 | ;;;###autoload | 815 | ;;;###autoload |
| 821 | (cl-defun frameset-save (frame-list | 816 | (cl-defun frameset-save (frame-list |