aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Rudalics2017-04-14 09:26:03 +0200
committerMartin Rudalics2017-04-14 09:26:03 +0200
commit96644ed496cfc36ef886c401250203c57d77ab75 (patch)
treeaab468083ac1991aa01e90fc2b53f403b416f611
parent86e512ed10d83e2d233cfb95bff68b6c05729686 (diff)
downloademacs-96644ed496cfc36ef886c401250203c57d77ab75.tar.gz
emacs-96644ed496cfc36ef886c401250203c57d77ab75.zip
A few additional copy-edits in documentation of frames
* doc/lispref/frames.texi (Frame Layout) (Implied Frame Resizing): Windows -> MS-Windows. (Deleting Frames): Fix typo.
-rw-r--r--doc/lispref/frames.texi15
1 files changed, 8 insertions, 7 deletions
diff --git a/doc/lispref/frames.texi b/doc/lispref/frames.texi
index b8f42578111..9a32f0045a2 100644
--- a/doc/lispref/frames.texi
+++ b/doc/lispref/frames.texi
@@ -575,7 +575,7 @@ frames. Display of the title bar can be suppressed by setting the
575@cindex external menu bar 575@cindex external menu bar
576The menu bar (@pxref{Menu Bar}) can be either internal (drawn by Emacs 576The menu bar (@pxref{Menu Bar}) can be either internal (drawn by Emacs
577itself) or external (drawn by the toolkit). Most builds (GTK+, Lucid, 577itself) or external (drawn by the toolkit). Most builds (GTK+, Lucid,
578Motif and Windows) rely on an external menu bar. NS also uses an 578Motif and MS-Windows) rely on an external menu bar. NS also uses an
579external menu bar which, however, is not part of the outer frame. 579external menu bar which, however, is not part of the outer frame.
580Non-toolkit builds can provide an internal menu bar. On text terminal 580Non-toolkit builds can provide an internal menu bar. On text terminal
581frames, the menu bar is part of the frame's root window (@pxref{Windows 581frames, the menu bar is part of the frame's root window (@pxref{Windows
@@ -648,8 +648,9 @@ indicate that position for the various builds:
648@end itemize 648@end itemize
649 649
650Accordingly, the native height of a frame may include the height of the 650Accordingly, the native height of a frame may include the height of the
651tool bar but not that of the menu bar (Lucid, Motif, Windows) or those 651tool bar but not that of the menu bar (Lucid, Motif, MS-Windows) or
652of the menu bar and the tool bar (non-toolkit and text terminal frames). 652those of the menu bar and the tool bar (non-toolkit and text terminal
653frames).
653 654
654The native position of a frame is the reference position for functions 655The native position of a frame is the reference position for functions
655that set or return the current position of the mouse (@pxref{Mouse 656that set or return the current position of the mouse (@pxref{Mouse
@@ -1153,7 +1154,7 @@ unchanged if this option is either @code{t} or a list containing
1153@code{vertical-scroll-bars}. 1154@code{vertical-scroll-bars}.
1154 1155
1155The default value is @code{'(tool-bar-lines)} for Lucid, Motif and 1156The default value is @code{'(tool-bar-lines)} for Lucid, Motif and
1156Windows (which means that adding/removing a tool bar there does not 1157MS-Windows (which means that adding/removing a tool bar there does not
1157change the outer frame height), @code{nil} on all other window systems 1158change the outer frame height), @code{nil} on all other window systems
1158including GTK+ (which means that changing any of the parameters listed 1159including GTK+ (which means that changing any of the parameters listed
1159above may change the size of the outer frame), and @code{t} otherwise 1160above may change the size of the outer frame), and @code{t} otherwise
@@ -2275,9 +2276,9 @@ frame.
2275It first deletes any child frame of @var{frame} (@pxref{Child Frames}) 2276It first deletes any child frame of @var{frame} (@pxref{Child Frames})
2276and any frame whose @code{delete-before} frame parameter (@pxref{Frame 2277and any frame whose @code{delete-before} frame parameter (@pxref{Frame
2277Interaction Parameters}) specifies @var{frame}. All such deletions are 2278Interaction Parameters}) specifies @var{frame}. All such deletions are
2278performed recursively; so this step makes sure that there no other 2279performed recursively; so this step makes sure that no other frames with
2279frames with @var{frame} as their ancestor will exist. Then, unless 2280@var{frame} as their ancestor will exist. Then, unless @var{frame}
2280@var{frame} specifies a tooltip, this function runs the hook 2281specifies a tooltip, this function runs the hook
2281@code{delete-frame-functions} (each function getting one argument, 2282@code{delete-frame-functions} (each function getting one argument,
2282@var{frame}) before actually killing the frame. 2283@var{frame}) before actually killing the frame.
2283 2284