diff options
| author | Glenn Morris <rgm@gnu.org> | 2018-11-20 09:38:42 -0800 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2018-11-20 09:38:42 -0800 |
| commit | bb7b75d7110c7a46407aa4efc33446ace0cba631 (patch) | |
| tree | 110ea4c557a39818da2ed8ebcea40f237b48a0f6 /src/window.h | |
| parent | e1b2c21b431accc397219b432a76a716acc6dbc2 (diff) | |
| parent | 070e82b96bfadb5a3622607a8c5c97c127ec62db (diff) | |
| download | emacs-bb7b75d7110c7a46407aa4efc33446ace0cba631.tar.gz | |
Merge from origin/emacs-26
070e82b ; * src/window.c (window_scroll): Improve commentary.
60457d7 Improve documentation of the window tree
ea1a014 Fix window scrolling on TTY frames when there's no mode line
df7ed10 Fix decoding XML files encoded in ISO-8859
7851ae8 (tag: emacs-26.1.90) ; ChangeLog.3 update
1958808 * etc/AUTHORS: Update.
7252507 Fix description of some window hooks
88762b4 Run 'window--adjust-process-windows' when frame size changes ...
d6542ea Avoid errors in zone.el when there's overlay at EOB
Diffstat (limited to 'src/window.h')
| -rw-r--r-- | src/window.h | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/window.h b/src/window.h index cc0b6b6667d..b3673a0b454 100644 --- a/src/window.h +++ b/src/window.h @@ -93,12 +93,14 @@ struct window /* The frame this window is on. */ Lisp_Object frame; - /* Following (to right or down) and preceding (to left or up) child - at same level of tree. */ + /* Following (to right or down) and preceding (to left or up) + child at same level of tree. Whether this is left/right or + up/down is determined by the 'horizontal' flag, see below. + A minibuffer window has the frame's root window pointed by 'prev'. */ Lisp_Object next; Lisp_Object prev; - /* The window this one is a child of. */ + /* The window this one is a child of. For a minibuffer window: nil. */ Lisp_Object parent; /* The normal size of the window. These are fractions, but we do @@ -113,7 +115,9 @@ struct window Lisp_Object new_normal; Lisp_Object new_pixel; - /* May be buffer, window, or nil. */ + /* For a leaf window: a buffer; for an internal window: a window; + for a pseudo-window (such as menu bar or tool bar): nil. It is + a buffer for a minibuffer window as well. */ Lisp_Object contents; /* A marker pointing to where in the text to start displaying. |