From: Eli Zaretskii <eliz@gnu.org>
Date: Sun, 4 Apr 2021 06:41:44 +0000 (+0300)
Subject: Fix recent changes regarding frame-scale-factor
X-Git-Tag: emacs-28.0.90~3026
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=69158a19956656c52208cbe8c11134eeed8ca867;p=emacs.git

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.
---

diff --git a/src/frame.c b/src/frame.c
index 784a079bffe..bbdc3b55992 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));
 }
 
 /***********************************************************************