5 files changed, 33 insertions, 9 deletions

diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index c3cd2ed798f..7aa53be2d99 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,10 @@
+2009-07-01  Jan Djärv  <jan.h.d@swipnet.se>
+
+        * xresources.texi (Table of Resources): Mention maximized for
+        fullscreen.
+
+        * cmdargs.texi (Window Size X): -mm/--maximized is new.
+
 2009-07-01  Chong Yidong  <cyd@stupidchicken.com>
 
         * anti.texi (Antinews): Correct the list of removed platforms.
diff --git a/doc/emacs/cmdargs.texi b/doc/emacs/cmdargs.texi
index 2d4d8b3d1a1..1438c19c123 100644
--- a/doc/emacs/cmdargs.texi
+++ b/doc/emacs/cmdargs.texi
@@ -1184,7 +1184,16 @@ the initial frame.
 @itemx --fullscreen
 @opindex --fullscreen
 @cindex fullscreen, command-line argument
-Specify that width and height shall be the size of the screen.
+Specify that width and height shall be the size of the screen. Normally
+no window manager decorations are shown.
+
+@item -mm
+@opindex -mm
+@itemx --maximized
+@opindex --maximized
+@cindex maximized, command-line argument
+Specify that the Emacs frame shall be maximized.  This normally
+means that the frame has window manager decorations.
 
 @item -fh
 @opindex -fh
@@ -1258,8 +1267,8 @@ size with no tool bar, use an X resource to specify ``no tool bar''
 (@pxref{Table of Resources}); then Emacs will already know there's no
 tool bar when it processes the specified geometry.
 
-  When using one of @samp{--fullscreen}, @samp{--fullwidth} or
-@samp{--fullheight} there may be some space around the frame
+  When using one of @samp{--fullscreen}, @samp{--maximized}, @samp{--fullwidth}
+or @samp{--fullheight} there may be some space around the frame
 anyway.  That is because Emacs rounds the sizes so they are an
 even number of character heights and widths.
 
diff --git a/doc/emacs/xresources.texi b/doc/emacs/xresources.texi
index a2deb1530ae..f471b9dd148 100644
--- a/doc/emacs/xresources.texi
+++ b/doc/emacs/xresources.texi
@@ -217,8 +217,8 @@ all frames.
 @ifnottex
 @item @code{fullscreen} (class @code{Fullscreen})
 The desired fullscreen size.  The value can be one of @code{fullboth},
-@code{fullwidth} or @code{fullheight}, which correspond to
-the command-line options @samp{-fs}, @samp{-fw}, and @samp{-fh}
+@code{maximized}, @code{fullwidth} or @code{fullheight}, which correspond to
+the command-line options @samp{-fs}, @samp{-mm}, @samp{-fw}, and @samp{-fh}
 (@pxref{Window Size X}).
 
 Note that this applies to the initial frame only.
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index dbff044e68c..e985de0cc37 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,7 @@
+2009-07-01  Jan Djärv  <jan.h.d@swipnet.se>
+
+        * frames.texi (Size Parameters): Mention maximized for fullscreen.
+
 2009-06-24  Chong Yidong  <cyd@stupidchicken.com>
 
         * display.texi (Window Systems): Add ns to the list.
diff --git a/doc/lispref/frames.texi b/doc/lispref/frames.texi
index 87127c9cd66..85bf2bb75e7 100644
--- a/doc/lispref/frames.texi
+++ b/doc/lispref/frames.texi
@@ -609,11 +609,15 @@ the @code{user-position} parameter (see above) does for the position
 parameters @code{top} and @code{left}.
 
 @item fullscreen
-Specify that width, height or both shall be set to the size of the screen.
-The value @code{fullwidth} specifies that width shall be the size of the
-screen.  The value @code{fullheight} specifies that height shall be the
-size of the screen.  The value @code{fullboth} specifies that both the
+Specify that width, height or both shall be maximized.
+The value @code{fullwidth} specifies that width shall as wide as possible.
+The value @code{fullheight} specifies that height shall be as tall as
+possible.  The value @code{fullboth} specifies that both the
 width and the height shall be set to the size of the screen.
+The value @code{maximized} specifies that the frame shall be maximized.
+The difference between @code{maximized} and @code{fullboth} is that
+the first does have window manager decorations but the second does not
+and thus really covers the whole screen.
 @end table
 
 @node Layout Parameters