[Emacs-diffs] emacs-24 r117436: Make doc-string of window-total-size more self-contained.

[Martin Rudalics]

------------------------------------------------------------
revno: 117436
revision-id: address@hidden
parent: address@hidden
committer: martin rudalics <address@hidden>
branch nick: emacs-24
timestamp: Sun 2014-08-10 12:41:28 +0200
message:
  Make doc-string of window-total-size more self-contained.
  
  * window.el (window-total-size): Make doc-string more
  self-contained.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/window.el                 window.el-20091113204419-o5vbwnq5f7feedwu-94

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2014-08-09 16:50:13 +0000
+++ b/lisp/ChangeLog    2014-08-10 10:41:28 +0000
@@ -1,3 +1,8 @@
+2014-08-10  Martin Rudalics  <address@hidden>
+
+       * window.el (window-total-size): Make doc-string more
+       self-contained.
+
 2014-08-09  Martin Rudalics  <address@hidden>
 
        * window.el (display-buffer-below-selected): Restore original

=== modified file 'lisp/window.el'
--- a/lisp/window.el    2014-08-09 16:50:13 +0000
+++ b/lisp/window.el    2014-08-10 10:41:28 +0000
@@ -1117,8 +1117,17 @@
 WINDOW must be a valid window and defaults to the selected one.
 
 If HORIZONTAL is omitted or nil, return the total height of
-WINDOW, in lines, like `window-total-height'.  Otherwise return
-the total width, in columns, like `window-total-width'.
+WINDOW, in lines.  If WINDOW is live, its total height includes,
+in addition to the height of WINDOW's text, the heights of
+WINDOW's mode and header line and a bottom divider, if any.
+
+If HORIZONTAL is non-nil, return the total width of WINDOW, in
+columns.  If WINDOW is live, its total width includes, in
+addition to the width of WINDOW's text, the widths of WINDOW's
+fringes, margins, scroll bars and its right divider, if any.
+
+If WINDOW is internal, return the respective size of the screen
+areas spanned by its children.
 
 Optional argument ROUND is handled as for `window-total-height'
 and `window-total-width'."