diff options
| author | Joakim Verona | 2013-08-23 06:31:39 +0200 |
|---|---|---|
| committer | Joakim Verona | 2013-08-23 06:31:39 +0200 |
| commit | 5b3399e3bbd8ce641e15f3234e65b9a68940eb98 (patch) | |
| tree | e70cdb6b408c448d61d8a582b315cab1e2356c8f /src | |
| parent | 87174f325be32b8967bb50a81ad8f43a9482f10f (diff) | |
| parent | 6b729d1685255d309d6de0ac1c973527ec691f8b (diff) | |
| download | emacs-5b3399e3bbd8ce641e15f3234e65b9a68940eb98.tar.gz emacs-5b3399e3bbd8ce641e15f3234e65b9a68940eb98.zip | |
merge from trunk
Diffstat (limited to 'src')
| -rw-r--r-- | src/window.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/window.c b/src/window.c index 887c3a92ab7..cdda2b27a54 100644 --- a/src/window.c +++ b/src/window.c | |||
| @@ -5414,7 +5414,7 @@ struct save_window_data | |||
| 5414 | Lisp_Object saved_windows; | 5414 | Lisp_Object saved_windows; |
| 5415 | 5415 | ||
| 5416 | /* All fields above are traced by the GC. | 5416 | /* All fields above are traced by the GC. |
| 5417 | From `fame-cols' down, the fields are ignored by the GC. */ | 5417 | From `frame-cols' down, the fields are ignored by the GC. */ |
| 5418 | 5418 | ||
| 5419 | int frame_cols, frame_lines, frame_menu_bar_lines; | 5419 | int frame_cols, frame_lines, frame_menu_bar_lines; |
| 5420 | int frame_tool_bar_lines; | 5420 | int frame_tool_bar_lines; |