From f1d34d9136fbf1dc2cf58b5ba36311451f024956 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Tue, 4 Apr 2017 18:39:43 -0700 Subject: [PATCH] Minor cleanups related to type-of * src/data.c (Frecordp): Rename from Frecordp_p, for consistency. * src/data.c (syms_of_data): * src/frame.c (syms_of_frame): Put all the primitive type names together, under the "Types that type-of returns" comment. --- src/data.c | 10 +++++----- src/frame.c | 2 -- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/src/data.c b/src/data.c index 5fdbec2000e..3ffca54658d 100644 --- a/src/data.c +++ b/src/data.c @@ -368,7 +368,7 @@ DEFUN ("vectorp", Fvectorp, Svectorp, 1, 1, 0, return Qnil; } -DEFUN ("recordp", Frecordp_p, Srecordp, 1, 1, 0, +DEFUN ("recordp", Frecordp, Srecordp, 1, 1, 0, doc: /* Return t if OBJECT is a record. */) (Lisp_Object object) { @@ -3589,7 +3589,6 @@ syms_of_data (void) DEFSYM (Qquote, "quote"); DEFSYM (Qlambda, "lambda"); - DEFSYM (Qsubr, "subr"); DEFSYM (Qerror_conditions, "error-conditions"); DEFSYM (Qerror_message, "error-message"); DEFSYM (Qtop_level, "top-level"); @@ -3737,6 +3736,7 @@ syms_of_data (void) DEFSYM (Qwindow_configuration, "window-configuration"); DEFSYM (Qprocess, "process"); DEFSYM (Qwindow, "window"); + DEFSYM (Qsubr, "subr"); DEFSYM (Qcompiled_function, "compiled-function"); DEFSYM (Qbuffer, "buffer"); DEFSYM (Qframe, "frame"); @@ -3748,12 +3748,12 @@ syms_of_data (void) DEFSYM (Qthread, "thread"); DEFSYM (Qmutex, "mutex"); DEFSYM (Qcondition_variable, "condition-variable"); - - DEFSYM (Qdefun, "defun"); - DEFSYM (Qfont_spec, "font-spec"); DEFSYM (Qfont_entity, "font-entity"); DEFSYM (Qfont_object, "font-object"); + DEFSYM (Qterminal, "terminal"); + + DEFSYM (Qdefun, "defun"); DEFSYM (Qinteractive_form, "interactive-form"); DEFSYM (Qdefalias_fset_function, "defalias-fset-function"); diff --git a/src/frame.c b/src/frame.c index 162b2038fd8..d873147fc8b 100644 --- a/src/frame.c +++ b/src/frame.c @@ -4923,8 +4923,6 @@ syms_of_frame (void) DEFSYM (Qx_resource_name, "x-resource-name"); DEFSYM (Qx_frame_parameter, "x-frame-parameter"); - DEFSYM (Qterminal, "terminal"); - DEFSYM (Qworkarea, "workarea"); DEFSYM (Qmm_size, "mm-size"); DEFSYM (Qframes, "frames"); -- 2.39.2