diff options
author | Yuuki Harano <masm+github@masm11.me> | 2021-04-18 15:30:29 +0900 |
---|---|---|
committer | Yuuki Harano <masm+github@masm11.me> | 2021-04-18 15:30:29 +0900 |
commit | de46c7796e635faf8647a7c6a5ae34fda9adae3b (patch) | |
tree | 1a2c5f85416a642300ca217b3d85ff1be5d9f35e /src/frame.c | |
parent | fb5f3e694b0f6e2bccfc2124555c986fdc409cd0 (diff) | |
parent | 5c07cd0f156217db268ccb9fa64566fb429c4257 (diff) | |
download | emacs-de46c7796e635faf8647a7c6a5ae34fda9adae3b.tar.gz emacs-de46c7796e635faf8647a7c6a5ae34fda9adae3b.tar.bz2 emacs-de46c7796e635faf8647a7c6a5ae34fda9adae3b.zip |
Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs into feature/pgtk
Diffstat (limited to 'src/frame.c')
-rw-r--r-- | src/frame.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/frame.c b/src/frame.c index 17e1b3f7261..a20c53699ac 100644 --- a/src/frame.c +++ b/src/frame.c @@ -3750,6 +3750,7 @@ window state change flag is reset. */) DEFUN ("frame-scale-factor", Fframe_scale_factor, Sframe_scale_factor, 0, 1, 0, doc: /* Return FRAMEs scale factor. +If FRAME is omitted or nil, the selected frame is used. 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) |