diff options
| author | Joakim Verona | 2013-07-02 22:46:17 +0200 |
|---|---|---|
| committer | Joakim Verona | 2013-07-02 22:46:17 +0200 |
| commit | 3718127221fbbc31f8ebd027ab7c95403dbe9118 (patch) | |
| tree | ef422898f3344c8f94f6ecf63eb583122bbf2bd8 /src/frame.c | |
| parent | 1ce45b902c67b8a0dda8d71bd2812de29a9988a6 (diff) | |
| parent | a3b49114c186d84404226af75ae7905bd1cd018f (diff) | |
| download | emacs-3718127221fbbc31f8ebd027ab7c95403dbe9118.tar.gz emacs-3718127221fbbc31f8ebd027ab7c95403dbe9118.zip | |
Merge branch 'trunk' into xwidget
Conflicts:
src/window.c
Diffstat (limited to 'src/frame.c')
| -rw-r--r-- | src/frame.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/frame.c b/src/frame.c index a207ef690da..ba9074ddebe 100644 --- a/src/frame.c +++ b/src/frame.c | |||
| @@ -2925,7 +2925,7 @@ x_report_frame_params (struct frame *f, Lisp_Object *alistptr) | |||
| 2925 | if (FRAME_X_OUTPUT (f)->parent_desc == FRAME_X_DISPLAY_INFO (f)->root_window) | 2925 | if (FRAME_X_OUTPUT (f)->parent_desc == FRAME_X_DISPLAY_INFO (f)->root_window) |
| 2926 | tem = Qnil; | 2926 | tem = Qnil; |
| 2927 | else | 2927 | else |
| 2928 | XSETFASTINT (tem, FRAME_X_OUTPUT (f)->parent_desc); | 2928 | tem = make_natnum ((uintptr_t) FRAME_X_OUTPUT (f)->parent_desc); |
| 2929 | store_in_alist (alistptr, Qexplicit_name, (f->explicit_name ? Qt : Qnil)); | 2929 | store_in_alist (alistptr, Qexplicit_name, (f->explicit_name ? Qt : Qnil)); |
| 2930 | store_in_alist (alistptr, Qparent_id, tem); | 2930 | store_in_alist (alistptr, Qparent_id, tem); |
| 2931 | store_in_alist (alistptr, Qtool_bar_position, f->tool_bar_position); | 2931 | store_in_alist (alistptr, Qtool_bar_position, f->tool_bar_position); |