diff options
| author | Paul Eggert | 2017-06-20 08:48:14 -0700 |
|---|---|---|
| committer | Paul Eggert | 2017-06-20 09:01:43 -0700 |
| commit | fb45f7075afa033de27e358739cbda0107af12b2 (patch) | |
| tree | 010d44c8382fd68eb13ae680d96a3cfa83aba25a /src/xfns.c | |
| parent | 6fcbbc393eced8350f6d4679d8070bfc48244aab (diff) | |
| download | emacs-fb45f7075afa033de27e358739cbda0107af12b2.tar.gz emacs-fb45f7075afa033de27e358739cbda0107af12b2.zip | |
Fix crash when built by GNU Gold linker on x86
Problem reported by Andrés Musetti (Bug#27248).
* src/widget.c (emacsFrameClassRec): Do not initialize superclass here.
(emacsFrameClass): Now a function (which initializes the
superclass) instead of a variable. All uses changed.
Diffstat (limited to 'src/xfns.c')
| -rw-r--r-- | src/xfns.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/xfns.c b/src/xfns.c index e463391c74a..7be2253cc3b 100644 --- a/src/xfns.c +++ b/src/xfns.c | |||
| @@ -2875,7 +2875,7 @@ x_window (struct frame *f, long window_prompting) | |||
| 2875 | XtSetArg (al[ac], XtNdepth, FRAME_DISPLAY_INFO (f)->n_planes); ac++; | 2875 | XtSetArg (al[ac], XtNdepth, FRAME_DISPLAY_INFO (f)->n_planes); ac++; |
| 2876 | XtSetArg (al[ac], XtNcolormap, FRAME_X_COLORMAP (f)); ac++; | 2876 | XtSetArg (al[ac], XtNcolormap, FRAME_X_COLORMAP (f)); ac++; |
| 2877 | XtSetArg (al[ac], XtNborderWidth, 0); ac++; | 2877 | XtSetArg (al[ac], XtNborderWidth, 0); ac++; |
| 2878 | frame_widget = XtCreateWidget (f->namebuf, emacsFrameClass, pane_widget, | 2878 | frame_widget = XtCreateWidget (f->namebuf, emacsFrameClass (), pane_widget, |
| 2879 | al, ac); | 2879 | al, ac); |
| 2880 | 2880 | ||
| 2881 | f->output_data.x->edit_widget = frame_widget; | 2881 | f->output_data.x->edit_widget = frame_widget; |