procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* src/data.c (Ftype_of): xwidget objects are possible! (bug#33294)

Browse source 
(syms_of_data): Define Qwidget here.
* src/xwidget.c (syms_of_xwidget): Instead of here.
This commit is contained in:
Stefan Monnier 2018-11-09 09:51:54 -05:00
parent a3242cc459
commit 92296de42b
2 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/data.c
View file

@ -276,10 +276,12 @@ for example, (type-of 1) returns `integer'. */)
} }
case PVEC_MODULE_FUNCTION: case PVEC_MODULE_FUNCTION:
return Qmodule_function; return Qmodule_function;
/* "Impossible" cases. */
case PVEC_XWIDGET: case PVEC_XWIDGET:
case PVEC_OTHER: return Qxwidget;
case PVEC_XWIDGET_VIEW: case PVEC_XWIDGET_VIEW:
return Qxwidget_view;
/* "Impossible" cases. */
case PVEC_OTHER:
case PVEC_SUB_CHAR_TABLE: case PVEC_SUB_CHAR_TABLE:
case PVEC_FREE: ; case PVEC_FREE: ;
} }
@ -3732,8 +3734,8 @@ syms_of_data (void)
DEFSYM (Qmarker, "marker"); DEFSYM (Qmarker, "marker");
DEFSYM (Qoverlay, "overlay"); DEFSYM (Qoverlay, "overlay");
DEFSYM (Qfinalizer, "finalizer"); DEFSYM (Qfinalizer, "finalizer");
#ifdef HAVE_MODULES
DEFSYM (Qmodule_function, "module-function"); DEFSYM (Qmodule_function, "module-function");
#ifdef HAVE_MODULES
DEFSYM (Quser_ptr, "user-ptr"); DEFSYM (Quser_ptr, "user-ptr");
#endif #endif
DEFSYM (Qfloat, "float"); DEFSYM (Qfloat, "float");
@ -3756,6 +3758,8 @@ syms_of_data (void)
DEFSYM (Qfont_entity, "font-entity"); DEFSYM (Qfont_entity, "font-entity");
DEFSYM (Qfont_object, "font-object"); DEFSYM (Qfont_object, "font-object");
DEFSYM (Qterminal, "terminal"); DEFSYM (Qterminal, "terminal");
DEFSYM (Qxwidget, "xwidget");
DEFSYM (Qxwidget_view, "xwidget-view");
DEFSYM (Qdefun, "defun"); DEFSYM (Qdefun, "defun");

2
src/xwidget.c
View file

@ -992,8 +992,6 @@ syms_of_xwidget (void)
defsubr (&Sxwidget_buffer); defsubr (&Sxwidget_buffer);
defsubr (&Sset_xwidget_plist); defsubr (&Sset_xwidget_plist);
DEFSYM (Qxwidget, "xwidget");
DEFSYM (QCxwidget, ":xwidget"); DEFSYM (QCxwidget, ":xwidget");
DEFSYM (QCtitle, ":title"); DEFSYM (QCtitle, ":title");