diff options
| author | Glenn Morris <rgm@gnu.org> | 2018-11-12 09:38:27 -0800 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2018-11-12 09:38:27 -0800 |
| commit | 23209e2c194f20deba26d8894a25f0ac4a607fe3 (patch) | |
| tree | 028930ef8214a18e9d1346afcfd8acc1ee21c1ed /src | |
| parent | db711687c3983eda60275dadcc4dc75119e6c0ae (diff) | |
| parent | 913c001f43350a70c8fc9d3eb846242eb63c9ae8 (diff) | |
| download | emacs-23209e2c194f20deba26d8894a25f0ac4a607fe3.tar.gz | |
Merge from origin/emacs-26
913c001 * lisp/files.el (write-file): Clarify the doc string. (Bug#3...
d614b84 Fix typos in midnight.el
8c2778a Improve documentation of 'move-file-to-trash'
c7b8a51 ; * doc/lispref/functions.texi (Anonymous Functions): Fix typo.
92296de * src/data.c (Ftype_of): xwidget objects are possible! (bug#3...
a3242cc Improve documentation of Diff mode
39e85a0 Note that lex bound lambda forms are not self-quoting (Bug#33...
fa605f2 Rewrite buffer display related doc-strings and doc
aa55659 Fix call to GlobalMemoryStatusEx in w32.c
# Conflicts:
# doc/emacs/files.texi
# src/data.c
Diffstat (limited to 'src')
| -rw-r--r-- | src/data.c | 10 | ||||
| -rw-r--r-- | src/w32.c | 1 | ||||
| -rw-r--r-- | src/xwidget.c | 2 |
3 files changed, 8 insertions, 5 deletions
diff --git a/src/data.c b/src/data.c index f8b991e8981..0980cf99886 100644 --- a/src/data.c +++ b/src/data.c @@ -267,11 +267,13 @@ for example, (type-of 1) returns `integer'. */) } case PVEC_MODULE_FUNCTION: return Qmodule_function; + case PVEC_XWIDGET: + return Qxwidget; + case PVEC_XWIDGET_VIEW: + return Qxwidget_view; /* "Impossible" cases. */ case PVEC_MISC_PTR: - case PVEC_XWIDGET: case PVEC_OTHER: - case PVEC_XWIDGET_VIEW: case PVEC_SUB_CHAR_TABLE: case PVEC_FREE: ; } @@ -3930,8 +3932,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"); @@ -3954,6 +3956,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/w32.c b/src/w32.c index 3eaa1279dd6..26cfae7a6af 100644 --- a/src/w32.c +++ b/src/w32.c @@ -7225,6 +7225,7 @@ system_process_attributes (Lisp_Object pid) code_convert_string_norecord (tem, Vlocale_coding_system, 0)), attrs); + memstex.dwLength = sizeof (memstex); if (global_memory_status_ex (&memstex)) #if __GNUC__ || (defined (_MSC_VER) && _MSC_VER >= 1300) totphys = memstex.ullTotalPhys / 1024.0; diff --git a/src/xwidget.c b/src/xwidget.c index 4739993e729..6faac107518 100644 --- a/src/xwidget.c +++ b/src/xwidget.c @@ -1014,8 +1014,6 @@ syms_of_xwidget (void) defsubr (&Sxwidget_buffer); defsubr (&Sset_xwidget_plist); - DEFSYM (Qxwidget, "xwidget"); - DEFSYM (QCxwidget, ":xwidget"); DEFSYM (QCtitle, ":title"); |