diff options
| author | Jan D | 2015-05-23 12:28:54 +0200 |
|---|---|---|
| committer | Jan D | 2015-05-23 12:28:54 +0200 |
| commit | 6aaa489dc112f51f6045f79b37cb78dd513e398f (patch) | |
| tree | a34eb6ad435ab877848f7464374570549ca55ec5 /src/xfns.c | |
| parent | ee14727ce033bae3bc11af35e7843604e5a5e635 (diff) | |
| parent | 7ac84a2570e1268cc040fcd529508307b2b22c01 (diff) | |
| download | emacs-6aaa489dc112f51f6045f79b37cb78dd513e398f.tar.gz emacs-6aaa489dc112f51f6045f79b37cb78dd513e398f.zip | |
Merge branch 'master' into cairo
Diffstat (limited to 'src/xfns.c')
| -rw-r--r-- | src/xfns.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/xfns.c b/src/xfns.c index 80c214a7a56..5ac58e9c7e0 100644 --- a/src/xfns.c +++ b/src/xfns.c | |||
| @@ -4320,13 +4320,13 @@ elements (all size values are in pixels). | |||
| 4320 | 4320 | ||
| 4321 | - `title-bar-height' is the height of the title bar of FRAME. | 4321 | - `title-bar-height' is the height of the title bar of FRAME. |
| 4322 | 4322 | ||
| 4323 | - `menu-bar-external' if `t' means the menu bar is external (not | 4323 | - `menu-bar-external' if t means the menu bar is external (not |
| 4324 | included in the inner edges of FRAME). | 4324 | included in the inner edges of FRAME). |
| 4325 | 4325 | ||
| 4326 | - `menu-bar-size' is a cons of the width and height of the menu bar of | 4326 | - `menu-bar-size' is a cons of the width and height of the menu bar of |
| 4327 | FRAME. | 4327 | FRAME. |
| 4328 | 4328 | ||
| 4329 | - `tool-bar-external' if `t' means the tool bar is external (not | 4329 | - `tool-bar-external' if t means the tool bar is external (not |
| 4330 | included in the inner edges of FRAME). | 4330 | included in the inner edges of FRAME). |
| 4331 | 4331 | ||
| 4332 | - `tool-bar-side' tells tells on which side the tool bar on FRAME is and | 4332 | - `tool-bar-side' tells tells on which side the tool bar on FRAME is and |