diff options
| author | Stefan Monnier | 2018-11-09 09:51:54 -0500 |
|---|---|---|
| committer | Stefan Monnier | 2018-11-09 09:51:54 -0500 |
| commit | 92296de42bc5805670d083e2518e00251cb1375c (patch) | |
| tree | 11d69082695e8bcf6b162a746a979bfb567a106b /src | |
| parent | a3242cc4593a1682f467d00b93670e538171c620 (diff) | |
| download | emacs-92296de42bc5805670d083e2518e00251cb1375c.tar.gz emacs-92296de42bc5805670d083e2518e00251cb1375c.zip | |
* 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.
Diffstat (limited to 'src')
| -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'. */) | |||
| 276 | } | 276 | } |
| 277 | case PVEC_MODULE_FUNCTION: | 277 | case PVEC_MODULE_FUNCTION: |
| 278 | return Qmodule_function; | 278 | return Qmodule_function; |
| 279 | /* "Impossible" cases. */ | ||
| 280 | case PVEC_XWIDGET: | 279 | case PVEC_XWIDGET: |
| 281 | case PVEC_OTHER: | 280 | return Qxwidget; |
| 282 | case PVEC_XWIDGET_VIEW: | 281 | case PVEC_XWIDGET_VIEW: |
| 282 | return Qxwidget_view; | ||
| 283 | /* "Impossible" cases. */ | ||
| 284 | case PVEC_OTHER: | ||
| 283 | case PVEC_SUB_CHAR_TABLE: | 285 | case PVEC_SUB_CHAR_TABLE: |
| 284 | case PVEC_FREE: ; | 286 | case PVEC_FREE: ; |
| 285 | } | 287 | } |
| @@ -3732,8 +3734,8 @@ syms_of_data (void) | |||
| 3732 | DEFSYM (Qmarker, "marker"); | 3734 | DEFSYM (Qmarker, "marker"); |
| 3733 | DEFSYM (Qoverlay, "overlay"); | 3735 | DEFSYM (Qoverlay, "overlay"); |
| 3734 | DEFSYM (Qfinalizer, "finalizer"); | 3736 | DEFSYM (Qfinalizer, "finalizer"); |
| 3735 | #ifdef HAVE_MODULES | ||
| 3736 | DEFSYM (Qmodule_function, "module-function"); | 3737 | DEFSYM (Qmodule_function, "module-function"); |
| 3738 | #ifdef HAVE_MODULES | ||
| 3737 | DEFSYM (Quser_ptr, "user-ptr"); | 3739 | DEFSYM (Quser_ptr, "user-ptr"); |
| 3738 | #endif | 3740 | #endif |
| 3739 | DEFSYM (Qfloat, "float"); | 3741 | DEFSYM (Qfloat, "float"); |
| @@ -3756,6 +3758,8 @@ syms_of_data (void) | |||
| 3756 | DEFSYM (Qfont_entity, "font-entity"); | 3758 | DEFSYM (Qfont_entity, "font-entity"); |
| 3757 | DEFSYM (Qfont_object, "font-object"); | 3759 | DEFSYM (Qfont_object, "font-object"); |
| 3758 | DEFSYM (Qterminal, "terminal"); | 3760 | DEFSYM (Qterminal, "terminal"); |
| 3761 | DEFSYM (Qxwidget, "xwidget"); | ||
| 3762 | DEFSYM (Qxwidget_view, "xwidget-view"); | ||
| 3759 | 3763 | ||
| 3760 | DEFSYM (Qdefun, "defun"); | 3764 | DEFSYM (Qdefun, "defun"); |
| 3761 | 3765 | ||
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) | |||
| 992 | defsubr (&Sxwidget_buffer); | 992 | defsubr (&Sxwidget_buffer); |
| 993 | defsubr (&Sset_xwidget_plist); | 993 | defsubr (&Sset_xwidget_plist); |
| 994 | 994 | ||
| 995 | DEFSYM (Qxwidget, "xwidget"); | ||
| 996 | |||
| 997 | DEFSYM (QCxwidget, ":xwidget"); | 995 | DEFSYM (QCxwidget, ":xwidget"); |
| 998 | DEFSYM (QCtitle, ":title"); | 996 | DEFSYM (QCtitle, ":title"); |
| 999 | 997 | ||