diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2018-11-09 09:51:54 -0500 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2018-11-09 09:51:54 -0500 |
| commit | 92296de42bc5805670d083e2518e00251cb1375c (patch) | |
| tree | 11d69082695e8bcf6b162a746a979bfb567a106b | |
| parent | a3242cc4593a1682f467d00b93670e538171c620 (diff) | |
| download | emacs-92296de42bc5805670d083e2518e00251cb1375c.tar.gz | |
* src/data.c (Ftype_of): xwidget objects are possible! (bug#33294)
(syms_of_data): Define Qwidget here.
* src/xwidget.c (syms_of_xwidget): Instead of here.
| -rw-r--r-- | src/data.c | 10 | ||||
| -rw-r--r-- | src/xwidget.c | 2 |
2 files changed, 7 insertions, 5 deletions
diff --git a/src/data.c b/src/data.c index 8d58cbd9410..0a098c99949 100644 --- a/src/data.c +++ b/src/data.c @@ -276,10 +276,12 @@ for example, (type-of 1) returns `integer'. */) } case PVEC_MODULE_FUNCTION: return Qmodule_function; - /* "Impossible" cases. */ case PVEC_XWIDGET: - case PVEC_OTHER: + return Qxwidget; case PVEC_XWIDGET_VIEW: + return Qxwidget_view; + /* "Impossible" cases. */ + case PVEC_OTHER: case PVEC_SUB_CHAR_TABLE: case PVEC_FREE: ; } @@ -3732,8 +3734,8 @@ syms_of_data (void) DEFSYM (Qmarker, "marker"); DEFSYM (Qoverlay, "overlay"); DEFSYM (Qfinalizer, "finalizer"); -#ifdef HAVE_MODULES DEFSYM (Qmodule_function, "module-function"); +#ifdef HAVE_MODULES DEFSYM (Quser_ptr, "user-ptr"); #endif DEFSYM (Qfloat, "float"); @@ -3756,6 +3758,8 @@ syms_of_data (void) DEFSYM (Qfont_entity, "font-entity"); DEFSYM (Qfont_object, "font-object"); DEFSYM (Qterminal, "terminal"); + DEFSYM (Qxwidget, "xwidget"); + DEFSYM (Qxwidget_view, "xwidget-view"); DEFSYM (Qdefun, "defun"); diff --git a/src/xwidget.c b/src/xwidget.c index 530d1af707a..bcc450bac60 100644 --- a/src/xwidget.c +++ b/src/xwidget.c @@ -992,8 +992,6 @@ syms_of_xwidget (void) defsubr (&Sxwidget_buffer); defsubr (&Sset_xwidget_plist); - DEFSYM (Qxwidget, "xwidget"); - DEFSYM (QCxwidget, ":xwidget"); DEFSYM (QCtitle, ":title"); |