aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Rudalics2015-02-14 18:50:37 +0100
committerMartin Rudalics2015-02-14 18:50:37 +0100
commitffec11d9b47d71978fbfc26fe37d936037f2dfac (patch)
treef26bf1be05279cd4fffc661cdb2837b1b06abe42
parentf4f4f93e42a0ae572a62c9f64b90e4401232d9f4 (diff)
downloademacs-ffec11d9b47d71978fbfc26fe37d936037f2dfac.tar.gz
emacs-ffec11d9b47d71978fbfc26fe37d936037f2dfac.zip
Fix doc-string of x_frame_normalize_before_maximize.
* xterm.c (x_frame_normalize_before_maximize): Fix doc-string. Suggested by Alan Mackenzie <acm@muc.de>.
-rw-r--r--src/ChangeLog5
-rw-r--r--src/xterm.c8
2 files changed, 10 insertions, 3 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 5144738a708..c89fa60a5b5 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
12015-02-14 Martin Rudalics <rudalics@gmx.at>
2
3 * xterm.c (x_frame_normalize_before_maximize): Fix doc-string.
4 Suggested by Alan Mackenzie <acm@muc.de>.
5
12015-02-14 Eli Zaretskii <eliz@gnu.org> 62015-02-14 Eli Zaretskii <eliz@gnu.org>
2 7
3 * menu.c (Fx_popup_menu) [HAVE_X_WINDOWS]: Call 8 * menu.c (Fx_popup_menu) [HAVE_X_WINDOWS]: Call
diff --git a/src/xterm.c b/src/xterm.c
index 0b3efe7b4b6..03c081179a6 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -11729,9 +11729,11 @@ default is nil, which is the same as `super'. */);
11729 DEFVAR_BOOL ("x-frame-normalize-before-maximize", 11729 DEFVAR_BOOL ("x-frame-normalize-before-maximize",
11730 x_frame_normalize_before_maximize, 11730 x_frame_normalize_before_maximize,
11731 doc: /* Non-nil means normalize frame before maximizing. 11731 doc: /* Non-nil means normalize frame before maximizing.
11732If this variable is t, Emacs asks the window manager to give the frame 11732If this variable is t, Emacs first asks the window manager to give the
11733intermediately its normal size whenever changing from a full-height or 11733frame its normal size, and only then the final state, whenever changing
11734full-width state to the fully maximized one and vice versa. 11734from a full-height, full-width or full-both state to the maximized one
11735or when changing from the maximized to the full-height or full-width
11736state.
11735 11737
11736Set this variable only if your window manager cannot handle the 11738Set this variable only if your window manager cannot handle the
11737transition between the various maximization states. */); 11739transition between the various maximization states. */);