[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master 69158a1: Fix recent changes regarding frame-scale-factor
From: |
Eli Zaretskii |
Subject: |
master 69158a1: Fix recent changes regarding frame-scale-factor |
Date: |
Sun, 4 Apr 2021 02:43:06 -0400 (EDT) |
branch: master
commit 69158a19956656c52208cbe8c11134eeed8ca867
Author: Eli Zaretskii <eliz@gnu.org>
Commit: Eli Zaretskii <eliz@gnu.org>
Fix recent changes regarding frame-scale-factor
* src/frame.c (Fframe_scale_factor): Make more robust and avoid
compiler warning while at that. Doc fix.
---
src/frame.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/frame.c b/src/frame.c
index 784a079..bbdc3b5 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -3747,13 +3747,13 @@ window state change flag is reset. */)
DEFUN ("frame-scale-factor", Fframe_scale_factor, Sframe_scale_factor,
0, 1, 0,
doc: /* Return FRAMEs scale factor.
-The scale factor is the amount a logical pixel size must be multiplied
-to find the real number of pixels. */)
+The scale factor is the amount by which a logical pixel size must be
+multiplied to find the real number of pixels. */)
(Lisp_Object frame)
{
struct frame *f = decode_live_frame (frame);
- return (make_float (FRAME_SCALE_FACTOR (f)));
+ return (make_float (f ? FRAME_SCALE_FACTOR (f) : 1));
}
/***********************************************************************
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- master 69158a1: Fix recent changes regarding frame-scale-factor,
Eli Zaretskii <=