[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs-26 92296de: * src/data.c (Ftype_of): xwidget objects
From: |
Stefan Monnier |
Subject: |
[Emacs-diffs] emacs-26 92296de: * src/data.c (Ftype_of): xwidget objects are possible! (bug#33294) |
Date: |
Fri, 9 Nov 2018 09:51:59 -0500 (EST) |
branch: emacs-26
commit 92296de42bc5805670d083e2518e00251cb1375c
Author: Stefan Monnier <address@hidden>
Commit: Stefan Monnier <address@hidden>
* 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.
---
src/data.c | 10 +++++++---
src/xwidget.c | 2 --
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/src/data.c b/src/data.c
index 8d58cbd..0a098c9 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 530d1af..bcc450b 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");
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] emacs-26 92296de: * src/data.c (Ftype_of): xwidget objects are possible! (bug#33294),
Stefan Monnier <=