aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Rudalics2014-01-11 11:01:01 +0100
committerMartin Rudalics2014-01-11 11:01:01 +0100
commitf96d0a6b46f59514cab8671b9bfdf6c4b83c3efc (patch)
treef4702f8a13e8c02d08246afaad8a00037f8c4059
parent7d7ccb8829db98eca38cd2bfb31132a7f1adc022 (diff)
downloademacs-f96d0a6b46f59514cab8671b9bfdf6c4b83c3efc.tar.gz
emacs-f96d0a6b46f59514cab8671b9bfdf6c4b83c3efc.zip
Fix doc-string of frame_resize_pixelwise.
* frame.c (frame_resize_pixelwise): Fix doc-string.
-rw-r--r--src/ChangeLog4
-rw-r--r--src/frame.c13
2 files changed, 13 insertions, 4 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index d015326e5ea..f258f38afbb 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
12014-01-11 Martin Rudalics <rudalics@gmx.at>
2
3 * frame.c (frame_resize_pixelwise): Fix doc-string.
4
12014-01-10 Martin Rudalics <rudalics@gmx.at> 52014-01-10 Martin Rudalics <rudalics@gmx.at>
2 6
3 Fix handling of internal borders (Bug#16348). 7 Fix handling of internal borders (Bug#16348).
diff --git a/src/frame.c b/src/frame.c
index 76883820672..703c67a3b1e 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -4709,7 +4709,6 @@ or call the function `tool-bar-mode'. */);
4709 4709
4710 DEFVAR_KBOARD ("default-minibuffer-frame", Vdefault_minibuffer_frame, 4710 DEFVAR_KBOARD ("default-minibuffer-frame", Vdefault_minibuffer_frame,
4711 doc: /* Minibufferless frames use this frame's minibuffer. 4711 doc: /* Minibufferless frames use this frame's minibuffer.
4712
4713Emacs cannot create minibufferless frames unless this is set to an 4712Emacs cannot create minibufferless frames unless this is set to an
4714appropriate surrogate. 4713appropriate surrogate.
4715 4714
@@ -4730,9 +4729,15 @@ automatically. See also `mouse-autoselect-window'. */);
4730 focus_follows_mouse = 0; 4729 focus_follows_mouse = 0;
4731 4730
4732 DEFVAR_BOOL ("frame-resize-pixelwise", frame_resize_pixelwise, 4731 DEFVAR_BOOL ("frame-resize-pixelwise", frame_resize_pixelwise,
4733 doc: /* Non-nil means frames are resized pixelwise. 4732 doc: /* Non-nil means resize frames pixelwise.
4734If this is nil, resizing a frame will round sizes to the frame's 4733If this option is nil, resizing a frame rounds its sizes to the frame's
4735current values of `frame-char-height' and `frame-char-width'. */); 4734current values of `frame-char-height' and `frame-char-width'. If this
4735is non-nil, no rounding occurs, hence frame sizes can increase/decrease
4736by one pixel.
4737
4738With some window managers you have to set this to non-nil in order to
4739fully maximize frames. The default of this option is nil. To resize
4740your initial frame pixelwise, set this option in your init file. */);
4736 frame_resize_pixelwise = 0; 4741 frame_resize_pixelwise = 0;
4737 4742
4738 staticpro (&Vframe_list); 4743 staticpro (&Vframe_list);