Commit f41f573e authored by Paul Eggert's avatar Paul Eggert

Rename C names to match Lisp symbols better

This was inspired by commit e65c3079,
which fixed a bug where the C name for a symbol disagreed with the
symbol name itself.  Fix other instances of disagreements that I found.
Although this doesn’t fix a bug, it should make code easier to follow.
The remaining disagreements are idiosyncratic: Qminus, Qplus,
Qsans__serif, Qbackquote, Qcomma, Qcomma_at, Qcomma_dot.
All uses changed.
* src/alloc.c (QAutomatic_GC): Rename from Qautomatic_gc.
* src/dbusbind.c (QCsystem): Rename from QCdbus_system_bus.
(QCsession): Rename from QCdbus_session_bus.
(QCtimeout): Rename from QCdbus_timeout.
(QCbyte): Rename from QCdbus_type_byte.
(QCboolean): Rename from QCdbus_type_boolean.
(QCint16): Rename from QCdbus_type_int16.
(QCuint16): Rename from QCdbus_type_uint16.
(QCint32): Rename from QCdbus_type_int32.
(QCuint32): Rename from QCdbus_type_uint32.
(QCint64): Rename from QCdbus_type_int64.
(QCuint64): Rename from QCdbus_type_uint64.
(QCdouble): Rename from QCdbus_type_double.
(QCstring): Rename from QCdbus_type_string.
(QCobject_path): Rename from QCdbus_type_object_path.
(QCsignature): Rename from QCdbus_type_signature.
(QCunix_fd): Rename from QCdbus_type_unix_fd.
(QCarray): Rename from QCdbus_type_array.
(QCvariant): Rename from QCdbus_type_variant.
(QCstruct): Rename from QCdbus_type_struct.
(QCdict_entry): Rename from QCdbus_type_dict_entry.
(QCserial): Rename from QCdbus_registered_serial.
(QCmethod): Rename from QCdbus_registered_method.
(QCsignal): Rename from QCdbus_registered_signal.
* src/emacs-module.c (Qinternal__module_call):
Rename from Qinternal_module_call.
* src/frame.c (Qwindow__pixel_to_total):
Rename from Qwindow_pixel_to_total.
* src/gnutls.c (QChostname): Rename from QCgnutls_bootprop_hostname.
(QCpriority): Rename from QCgnutls_bootprop_priority.
(QCtrustfiles): Rename from QCgnutls_bootprop_trustfiles.
(QCkeylist): Rename from QCgnutls_bootprop_keylist.
(QCcrlfiles): Rename from QCgnutls_bootprop_crlfiles.
(QCmin_prime_bits): Rename from QCgnutls_bootprop_min_prime_bits.
(QCloglevel): Rename from QCgnutls_bootprop_loglevel.
(QCcomplete_negotiation): Rename from QCgnutls_complete_negotiation.
(QCverify_flags): Rename from QCgnutls_bootprop_verify_flags.
(QCverify_error): Rename from QCgnutls_bootprop_verify_error.
* src/w32fns.c (Qfont_parameter): Rename from Qfont_param.
(Qgnutls): Rename from Qgnutls_dll.
(Qlibxml2): Rename from Qlibxml2_dll.
(Qzlib): Rename from Qzlib_dll.
* src/w32select.c (Qutf_16le_dos): Rename from QUNICODE.
* src/window.c (Qwindow__resize_root_window):
Rename from Qwindow_resize_root_window.
(Qwindow__resize_root_window_vertically):
Rename from Qwindow_resize_root_window_vertically.
(Qwindow__sanitize_window_sizes):
Rename from Qwindow_sanitize_window_sizes.
(Qwindow__pixel_to_total): Rename from Qwindow_pixel_to_total.
* src/xdisp.c (Qredisplay_internal_xC_functionx):
Rename from Qredisplay_internal.
* src/xfns.c (Qfont_parameter): Rename from Qfont_param.
* src/xselect.c (Q_EMACS_TMP_): Rename from QEMACS_TMP.
parent bc9cc21d
...@@ -5658,7 +5658,7 @@ garbage_collect_1 (void *end) ...@@ -5658,7 +5658,7 @@ garbage_collect_1 (void *end)
return Qnil; return Qnil;
/* Record this function, so it appears on the profiler's backtraces. */ /* Record this function, so it appears on the profiler's backtraces. */
record_in_backtrace (Qautomatic_gc, 0, 0); record_in_backtrace (QAutomatic_GC, 0, 0);
check_cons_list (); check_cons_list ();
...@@ -7388,7 +7388,7 @@ do hash-consing of the objects allocated to pure space. */); ...@@ -7388,7 +7388,7 @@ do hash-consing of the objects allocated to pure space. */);
DEFSYM (Qstring_bytes, "string-bytes"); DEFSYM (Qstring_bytes, "string-bytes");
DEFSYM (Qvector_slots, "vector-slots"); DEFSYM (Qvector_slots, "vector-slots");
DEFSYM (Qheap, "heap"); DEFSYM (Qheap, "heap");
DEFSYM (Qautomatic_gc, "Automatic GC"); DEFSYM (QAutomatic_GC, "Automatic GC");
DEFSYM (Qgc_cons_threshold, "gc-cons-threshold"); DEFSYM (Qgc_cons_threshold, "gc-cons-threshold");
DEFSYM (Qchar_table_extra_slots, "char-table-extra-slots"); DEFSYM (Qchar_table_extra_slots, "char-table-extra-slots");
......
...@@ -168,25 +168,25 @@ static int ...@@ -168,25 +168,25 @@ static int
xd_symbol_to_dbus_type (Lisp_Object object) xd_symbol_to_dbus_type (Lisp_Object object)
{ {
return return
((EQ (object, QCdbus_type_byte)) ? DBUS_TYPE_BYTE (EQ (object, QCbyte) ? DBUS_TYPE_BYTE
: (EQ (object, QCdbus_type_boolean)) ? DBUS_TYPE_BOOLEAN : EQ (object, QCboolean) ? DBUS_TYPE_BOOLEAN
: (EQ (object, QCdbus_type_int16)) ? DBUS_TYPE_INT16 : EQ (object, QCint16) ? DBUS_TYPE_INT16
: (EQ (object, QCdbus_type_uint16)) ? DBUS_TYPE_UINT16 : EQ (object, QCuint16) ? DBUS_TYPE_UINT16
: (EQ (object, QCdbus_type_int32)) ? DBUS_TYPE_INT32 : EQ (object, QCint32) ? DBUS_TYPE_INT32
: (EQ (object, QCdbus_type_uint32)) ? DBUS_TYPE_UINT32 : EQ (object, QCuint32) ? DBUS_TYPE_UINT32
: (EQ (object, QCdbus_type_int64)) ? DBUS_TYPE_INT64 : EQ (object, QCint64) ? DBUS_TYPE_INT64
: (EQ (object, QCdbus_type_uint64)) ? DBUS_TYPE_UINT64 : EQ (object, QCuint64) ? DBUS_TYPE_UINT64
: (EQ (object, QCdbus_type_double)) ? DBUS_TYPE_DOUBLE : EQ (object, QCdouble) ? DBUS_TYPE_DOUBLE
: (EQ (object, QCdbus_type_string)) ? DBUS_TYPE_STRING : EQ (object, QCstring) ? DBUS_TYPE_STRING
: (EQ (object, QCdbus_type_object_path)) ? DBUS_TYPE_OBJECT_PATH : EQ (object, QCobject_path) ? DBUS_TYPE_OBJECT_PATH
: (EQ (object, QCdbus_type_signature)) ? DBUS_TYPE_SIGNATURE : EQ (object, QCsignature) ? DBUS_TYPE_SIGNATURE
#ifdef DBUS_TYPE_UNIX_FD #ifdef DBUS_TYPE_UNIX_FD
: (EQ (object, QCdbus_type_unix_fd)) ? DBUS_TYPE_UNIX_FD : EQ (object, QCunix_fd) ? DBUS_TYPE_UNIX_FD
#endif #endif
: (EQ (object, QCdbus_type_array)) ? DBUS_TYPE_ARRAY : EQ (object, QCarray) ? DBUS_TYPE_ARRAY
: (EQ (object, QCdbus_type_variant)) ? DBUS_TYPE_VARIANT : EQ (object, QCvariant) ? DBUS_TYPE_VARIANT
: (EQ (object, QCdbus_type_struct)) ? DBUS_TYPE_STRUCT : EQ (object, QCstruct) ? DBUS_TYPE_STRUCT
: (EQ (object, QCdbus_type_dict_entry)) ? DBUS_TYPE_DICT_ENTRY : EQ (object, QCdict_entry) ? DBUS_TYPE_DICT_ENTRY
: DBUS_TYPE_INVALID); : DBUS_TYPE_INVALID);
} }
...@@ -257,16 +257,16 @@ XD_OBJECT_TO_STRING (Lisp_Object object) ...@@ -257,16 +257,16 @@ XD_OBJECT_TO_STRING (Lisp_Object object)
if ((session_bus_address != NULL) \ if ((session_bus_address != NULL) \
&& (!NILP (Fstring_equal \ && (!NILP (Fstring_equal \
(bus, build_string (session_bus_address))))) \ (bus, build_string (session_bus_address))))) \
bus = QCdbus_session_bus; \ bus = QCsession; \
} \ } \
\ \
else \ else \
{ \ { \
CHECK_SYMBOL (bus); \ CHECK_SYMBOL (bus); \
if (!(EQ (bus, QCdbus_system_bus) || EQ (bus, QCdbus_session_bus))) \ if (!(EQ (bus, QCsystem) || EQ (bus, QCsession))) \
XD_SIGNAL2 (build_string ("Wrong bus name"), bus); \ XD_SIGNAL2 (build_string ("Wrong bus name"), bus); \
/* We do not want to have an autolaunch for the session bus. */ \ /* We do not want to have an autolaunch for the session bus. */ \
if (EQ (bus, QCdbus_session_bus) && session_bus_address == NULL) \ if (EQ (bus, QCsession) && session_bus_address == NULL) \
XD_SIGNAL2 (build_string ("No connection to bus"), bus); \ XD_SIGNAL2 (build_string ("No connection to bus"), bus); \
} \ } \
} while (0) } while (0)
...@@ -395,7 +395,7 @@ xd_signature (char *signature, int dtype, int parent_type, Lisp_Object object) ...@@ -395,7 +395,7 @@ xd_signature (char *signature, int dtype, int parent_type, Lisp_Object object)
CHECK_CONS (object); CHECK_CONS (object);
/* Type symbol is optional. */ /* Type symbol is optional. */
if (EQ (QCdbus_type_array, CAR_SAFE (elt))) if (EQ (QCarray, CAR_SAFE (elt)))
elt = XD_NEXT_VALUE (elt); elt = XD_NEXT_VALUE (elt);
/* If the array is empty, DBUS_TYPE_STRING is the default /* If the array is empty, DBUS_TYPE_STRING is the default
...@@ -1009,8 +1009,7 @@ xd_add_watch (DBusWatch *watch, void *data) ...@@ -1009,8 +1009,7 @@ xd_add_watch (DBusWatch *watch, void *data)
} }
/* Stop monitoring WATCH for possible I/O. /* Stop monitoring WATCH for possible I/O.
DATA is the used bus, either a string or QCdbus_system_bus or DATA is the used bus, either a string or QCsystem or QCsession. */
QCdbus_session_bus. */
static void static void
xd_remove_watch (DBusWatch *watch, void *data) xd_remove_watch (DBusWatch *watch, void *data)
{ {
...@@ -1025,7 +1024,7 @@ xd_remove_watch (DBusWatch *watch, void *data) ...@@ -1025,7 +1024,7 @@ xd_remove_watch (DBusWatch *watch, void *data)
/* Unset session environment. */ /* Unset session environment. */
#if 0 #if 0
/* This is buggy, since unsetenv is not thread-safe. */ /* This is buggy, since unsetenv is not thread-safe. */
if (XSYMBOL (QCdbus_session_bus) == data) if (XSYMBOL (QCsession) == data)
{ {
XD_DEBUG_MESSAGE ("unsetenv DBUS_SESSION_BUS_ADDRESS"); XD_DEBUG_MESSAGE ("unsetenv DBUS_SESSION_BUS_ADDRESS");
unsetenv ("DBUS_SESSION_BUS_ADDRESS"); unsetenv ("DBUS_SESSION_BUS_ADDRESS");
...@@ -1147,14 +1146,14 @@ this connection to those buses. */) ...@@ -1147,14 +1146,14 @@ this connection to those buses. */)
connection = dbus_connection_open_private (SSDATA (bus), &derror); connection = dbus_connection_open_private (SSDATA (bus), &derror);
else else
if (NILP (private)) {
connection = dbus_bus_get (EQ (bus, QCdbus_system_bus) DBusBusType bustype = (EQ (bus, QCsystem)
? DBUS_BUS_SYSTEM : DBUS_BUS_SESSION, ? DBUS_BUS_SYSTEM : DBUS_BUS_SESSION);
&derror); if (NILP (private))
else connection = dbus_bus_get (bustype, &derror);
connection = dbus_bus_get_private (EQ (bus, QCdbus_system_bus) else
? DBUS_BUS_SYSTEM : DBUS_BUS_SESSION, connection = dbus_bus_get_private (bustype, &derror);
&derror); }
if (dbus_error_is_set (&derror)) if (dbus_error_is_set (&derror))
XD_ERROR (derror); XD_ERROR (derror);
...@@ -1405,7 +1404,7 @@ usage: (dbus-message-internal &rest REST) */) ...@@ -1405,7 +1404,7 @@ usage: (dbus-message-internal &rest REST) */)
} }
/* Check for timeout parameter. */ /* Check for timeout parameter. */
if ((count+2 <= nargs) && (EQ ((args[count]), QCdbus_timeout))) if ((count + 2 <= nargs) && EQ (args[count], QCtimeout))
{ {
CHECK_NATNUM (args[count+1]); CHECK_NATNUM (args[count+1]);
timeout = min (XFASTINT (args[count+1]), INT_MAX); timeout = min (XFASTINT (args[count+1]), INT_MAX);
...@@ -1452,8 +1451,7 @@ usage: (dbus-message-internal &rest REST) */) ...@@ -1452,8 +1451,7 @@ usage: (dbus-message-internal &rest REST) */)
/* The result is the key in Vdbus_registered_objects_table. */ /* The result is the key in Vdbus_registered_objects_table. */
serial = dbus_message_get_serial (dmessage); serial = dbus_message_get_serial (dmessage);
result = list3 (QCdbus_registered_serial, result = list3 (QCserial, bus, make_fixnum_or_float (serial));
bus, make_fixnum_or_float (serial));
/* Create a hash table entry. */ /* Create a hash table entry. */
Fputhash (result, handler, Vdbus_registered_objects_table); Fputhash (result, handler, Vdbus_registered_objects_table);
...@@ -1540,8 +1538,7 @@ xd_read_message_1 (DBusConnection *connection, Lisp_Object bus) ...@@ -1540,8 +1538,7 @@ xd_read_message_1 (DBusConnection *connection, Lisp_Object bus)
|| (mtype == DBUS_MESSAGE_TYPE_ERROR)) || (mtype == DBUS_MESSAGE_TYPE_ERROR))
{ {
/* Search for a registered function of the message. */ /* Search for a registered function of the message. */
key = list3 (QCdbus_registered_serial, bus, key = list3 (QCserial, bus, make_fixnum_or_float (serial));
make_fixnum_or_float (serial));
value = Fgethash (key, Vdbus_registered_objects_table, Qnil); value = Fgethash (key, Vdbus_registered_objects_table, Qnil);
/* There shall be exactly one entry. Construct an event. */ /* There shall be exactly one entry. Construct an event. */
...@@ -1566,9 +1563,7 @@ xd_read_message_1 (DBusConnection *connection, Lisp_Object bus) ...@@ -1566,9 +1563,7 @@ xd_read_message_1 (DBusConnection *connection, Lisp_Object bus)
goto cleanup; goto cleanup;
/* Search for a registered function of the message. */ /* Search for a registered function of the message. */
key = list4 ((mtype == DBUS_MESSAGE_TYPE_METHOD_CALL) key = list4 (mtype == DBUS_MESSAGE_TYPE_METHOD_CALL ? QCmethod : QCsignal,
? QCdbus_registered_method
: QCdbus_registered_signal,
bus, build_string (interface), build_string (member)); bus, build_string (interface), build_string (member));
value = Fgethash (key, Vdbus_registered_objects_table, Qnil); value = Fgethash (key, Vdbus_registered_objects_table, Qnil);
...@@ -1697,37 +1692,37 @@ syms_of_dbusbind (void) ...@@ -1697,37 +1692,37 @@ syms_of_dbusbind (void)
build_pure_c_string ("D-Bus error")); build_pure_c_string ("D-Bus error"));
/* Lisp symbols of the system and session buses. */ /* Lisp symbols of the system and session buses. */
DEFSYM (QCdbus_system_bus, ":system"); DEFSYM (QCsystem, ":system");
DEFSYM (QCdbus_session_bus, ":session"); DEFSYM (QCsession, ":session");
/* Lisp symbol for method call timeout. */ /* Lisp symbol for method call timeout. */
DEFSYM (QCdbus_timeout, ":timeout"); DEFSYM (QCtimeout, ":timeout");
/* Lisp symbols of D-Bus types. */ /* Lisp symbols of D-Bus types. */
DEFSYM (QCdbus_type_byte, ":byte"); DEFSYM (QCbyte, ":byte");
DEFSYM (QCdbus_type_boolean, ":boolean"); DEFSYM (QCboolean, ":boolean");
DEFSYM (QCdbus_type_int16, ":int16"); DEFSYM (QCint16, ":int16");
DEFSYM (QCdbus_type_uint16, ":uint16"); DEFSYM (QCuint16, ":uint16");
DEFSYM (QCdbus_type_int32, ":int32"); DEFSYM (QCint32, ":int32");
DEFSYM (QCdbus_type_uint32, ":uint32"); DEFSYM (QCuint32, ":uint32");
DEFSYM (QCdbus_type_int64, ":int64"); DEFSYM (QCint64, ":int64");
DEFSYM (QCdbus_type_uint64, ":uint64"); DEFSYM (QCuint64, ":uint64");
DEFSYM (QCdbus_type_double, ":double"); DEFSYM (QCdouble, ":double");
DEFSYM (QCdbus_type_string, ":string"); DEFSYM (QCstring, ":string");
DEFSYM (QCdbus_type_object_path, ":object-path"); DEFSYM (QCobject_path, ":object-path");
DEFSYM (QCdbus_type_signature, ":signature"); DEFSYM (QCsignature, ":signature");
#ifdef DBUS_TYPE_UNIX_FD #ifdef DBUS_TYPE_UNIX_FD
DEFSYM (QCdbus_type_unix_fd, ":unix-fd"); DEFSYM (QCunix_fd, ":unix-fd");
#endif #endif
DEFSYM (QCdbus_type_array, ":array"); DEFSYM (QCarray, ":array");
DEFSYM (QCdbus_type_variant, ":variant"); DEFSYM (QCvariant, ":variant");
DEFSYM (QCdbus_type_struct, ":struct"); DEFSYM (QCstruct, ":struct");
DEFSYM (QCdbus_type_dict_entry, ":dict-entry"); DEFSYM (QCdict_entry, ":dict-entry");
/* Lisp symbols of objects in `dbus-registered-objects-table'. */ /* Lisp symbols of objects in `dbus-registered-objects-table'. */
DEFSYM (QCdbus_registered_serial, ":serial"); DEFSYM (QCserial, ":serial");
DEFSYM (QCdbus_registered_method, ":method"); DEFSYM (QCmethod, ":method");
DEFSYM (QCdbus_registered_signal, ":signal"); DEFSYM (QCsignal, ":signal");
DEFVAR_LISP ("dbus-compiled-version", DEFVAR_LISP ("dbus-compiled-version",
Vdbus_compiled_version, Vdbus_compiled_version,
......
...@@ -42,7 +42,7 @@ static bool zlib_initialized; ...@@ -42,7 +42,7 @@ static bool zlib_initialized;
static bool static bool
init_zlib_functions (void) init_zlib_functions (void)
{ {
HMODULE library = w32_delayed_load (Qzlib_dll); HMODULE library = w32_delayed_load (Qzlib);
if (!library) if (!library)
return false; return false;
...@@ -91,7 +91,7 @@ DEFUN ("zlib-available-p", Fzlib_available_p, Szlib_available_p, 0, 0, 0, ...@@ -91,7 +91,7 @@ DEFUN ("zlib-available-p", Fzlib_available_p, Szlib_available_p, 0, 0, 0,
(void) (void)
{ {
#ifdef WINDOWSNT #ifdef WINDOWSNT
Lisp_Object found = Fassq (Qzlib_dll, Vlibrary_cache); Lisp_Object found = Fassq (Qzlib, Vlibrary_cache);
if (CONSP (found)) if (CONSP (found))
return XCDR (found); return XCDR (found);
else else
...@@ -99,7 +99,7 @@ DEFUN ("zlib-available-p", Fzlib_available_p, Szlib_available_p, 0, 0, 0, ...@@ -99,7 +99,7 @@ DEFUN ("zlib-available-p", Fzlib_available_p, Szlib_available_p, 0, 0, 0,
Lisp_Object status; Lisp_Object status;
zlib_initialized = init_zlib_functions (); zlib_initialized = init_zlib_functions ();
status = zlib_initialized ? Qt : Qnil; status = zlib_initialized ? Qt : Qnil;
Vlibrary_cache = Fcons (Fcons (Qzlib_dll, status), Vlibrary_cache); Vlibrary_cache = Fcons (Fcons (Qzlib, status), Vlibrary_cache);
return status; return status;
} }
#else #else
......
...@@ -405,7 +405,7 @@ module_make_function (emacs_env *env, ptrdiff_t min_arity, ptrdiff_t max_arity, ...@@ -405,7 +405,7 @@ module_make_function (emacs_env *env, ptrdiff_t min_arity, ptrdiff_t max_arity,
list2 (Qand_rest, Qargs), list2 (Qand_rest, Qargs),
doc, doc,
list4 (Qapply, list4 (Qapply,
list2 (Qfunction, Qinternal_module_call), list2 (Qfunction, Qinternal__module_call),
envobj, envobj,
Qargs)); Qargs));
...@@ -1047,7 +1047,7 @@ syms_of_module (void) ...@@ -1047,7 +1047,7 @@ syms_of_module (void)
defsubr (&Smodule_load); defsubr (&Smodule_load);
DEFSYM (Qinternal_module_call, "internal--module-call"); DEFSYM (Qinternal__module_call, "internal--module-call");
defsubr (&Sinternal_module_call); defsubr (&Sinternal_module_call);
} }
......
...@@ -534,7 +534,7 @@ adjust_frame_size (struct frame *f, int new_width, int new_height, int inhibit, ...@@ -534,7 +534,7 @@ adjust_frame_size (struct frame *f, int new_width, int new_height, int inhibit,
#endif #endif
} }
else if (new_cols != old_cols) else if (new_cols != old_cols)
call2 (Qwindow_pixel_to_total, frame, Qt); call2 (Qwindow__pixel_to_total, frame, Qt);
if (new_windows_height != old_windows_height if (new_windows_height != old_windows_height
/* When the top margin has changed we have to recalculate the top /* When the top margin has changed we have to recalculate the top
...@@ -550,7 +550,7 @@ adjust_frame_size (struct frame *f, int new_width, int new_height, int inhibit, ...@@ -550,7 +550,7 @@ adjust_frame_size (struct frame *f, int new_width, int new_height, int inhibit,
FrameRows (FRAME_TTY (f)) = new_lines + FRAME_TOP_MARGIN (f); FrameRows (FRAME_TTY (f)) = new_lines + FRAME_TOP_MARGIN (f);
} }
else if (new_lines != old_lines) else if (new_lines != old_lines)
call2 (Qwindow_pixel_to_total, frame, Qnil); call2 (Qwindow__pixel_to_total, frame, Qnil);
frame_size_history_add frame_size_history_add
(f, Qadjust_frame_size_3, new_text_width, new_text_height, (f, Qadjust_frame_size_3, new_text_width, new_text_height,
...@@ -3641,7 +3641,7 @@ x_set_font (struct frame *f, Lisp_Object arg, Lisp_Object oldval) ...@@ -3641,7 +3641,7 @@ x_set_font (struct frame *f, Lisp_Object arg, Lisp_Object oldval)
x_new_font (f, font_object, fontset); x_new_font (f, font_object, fontset);
store_frame_param (f, Qfont, arg); store_frame_param (f, Qfont, arg);
#ifdef HAVE_X_WINDOWS #ifdef HAVE_X_WINDOWS
store_frame_param (f, Qfont_param, font_param); store_frame_param (f, Qfont_parameter, font_param);
#endif #endif
/* Recalculate toolbar height. */ /* Recalculate toolbar height. */
f->n_tool_bar_rows = 0; f->n_tool_bar_rows = 0;
...@@ -4884,7 +4884,7 @@ syms_of_frame (void) ...@@ -4884,7 +4884,7 @@ syms_of_frame (void)
DEFSYM (Qframep, "framep"); DEFSYM (Qframep, "framep");
DEFSYM (Qframe_live_p, "frame-live-p"); DEFSYM (Qframe_live_p, "frame-live-p");
DEFSYM (Qframe_windows_min_size, "frame-windows-min-size"); DEFSYM (Qframe_windows_min_size, "frame-windows-min-size");
DEFSYM (Qwindow_pixel_to_total, "window--pixel-to-total"); DEFSYM (Qwindow__pixel_to_total, "window--pixel-to-total");
DEFSYM (Qexplicit_name, "explicit-name"); DEFSYM (Qexplicit_name, "explicit-name");
DEFSYM (Qheight, "height"); DEFSYM (Qheight, "height");
DEFSYM (Qicon, "icon"); DEFSYM (Qicon, "icon");
......
...@@ -184,7 +184,7 @@ init_gnutls_functions (void) ...@@ -184,7 +184,7 @@ init_gnutls_functions (void)
HMODULE library; HMODULE library;
int max_log_level = 1; int max_log_level = 1;
if (!(library = w32_delayed_load (Qgnutls_dll))) if (!(library = w32_delayed_load (Qgnutls)))
{ {
GNUTLS_LOG (1, max_log_level, "GnuTLS library not found"); GNUTLS_LOG (1, max_log_level, "GnuTLS library not found");
return 0; return 0;
...@@ -272,7 +272,7 @@ init_gnutls_functions (void) ...@@ -272,7 +272,7 @@ init_gnutls_functions (void)
max_log_level = global_gnutls_log_level; max_log_level = global_gnutls_log_level;
{ {
Lisp_Object name = CAR_SAFE (Fget (Qgnutls_dll, QCloaded_from)); Lisp_Object name = CAR_SAFE (Fget (Qgnutls, QCloaded_from));
GNUTLS_LOG2 (1, max_log_level, "GnuTLS library loaded:", GNUTLS_LOG2 (1, max_log_level, "GnuTLS library loaded:",
STRINGP (name) ? (const char *) SDATA (name) : "unknown"); STRINGP (name) ? (const char *) SDATA (name) : "unknown");
} }
...@@ -1199,8 +1199,8 @@ gnutls_verify_boot (Lisp_Object proc, Lisp_Object proplist) ...@@ -1199,8 +1199,8 @@ gnutls_verify_boot (Lisp_Object proc, Lisp_Object proplist)
if (NILP (proplist)) if (NILP (proplist))
proplist = Fcdr (Fplist_get (p->childp, QCtls_parameters)); proplist = Fcdr (Fplist_get (p->childp, QCtls_parameters));
verify_error = Fplist_get (proplist, QCgnutls_bootprop_verify_error); verify_error = Fplist_get (proplist, QCverify_error);
hostname = Fplist_get (proplist, QCgnutls_bootprop_hostname); hostname = Fplist_get (proplist, QChostname);
if (EQ (verify_error, Qt)) if (EQ (verify_error, Qt))
verify_error_all = true; verify_error_all = true;
...@@ -1245,7 +1245,7 @@ gnutls_verify_boot (Lisp_Object proc, Lisp_Object proplist) ...@@ -1245,7 +1245,7 @@ gnutls_verify_boot (Lisp_Object proc, Lisp_Object proplist)
if (peer_verification != 0) if (peer_verification != 0)
{ {
if (verify_error_all if (verify_error_all
|| !NILP (Fmember (QCgnutls_bootprop_trustfiles, verify_error))) || !NILP (Fmember (QCtrustfiles, verify_error)))
{ {
emacs_gnutls_deinit (proc); emacs_gnutls_deinit (proc);
boot_error (p, boot_error (p,
...@@ -1305,7 +1305,7 @@ gnutls_verify_boot (Lisp_Object proc, Lisp_Object proplist) ...@@ -1305,7 +1305,7 @@ gnutls_verify_boot (Lisp_Object proc, Lisp_Object proplist)
XPROCESS (proc)->gnutls_extra_peer_verification XPROCESS (proc)->gnutls_extra_peer_verification
|= CERTIFICATE_NOT_MATCHING; |= CERTIFICATE_NOT_MATCHING;
if (verify_error_all if (verify_error_all
|| !NILP (Fmember (QCgnutls_bootprop_hostname, verify_error))) || !NILP (Fmember (QChostname, verify_error)))
{ {
gnutls_x509_crt_deinit (gnutls_verify_cert); gnutls_x509_crt_deinit (gnutls_verify_cert);
emacs_gnutls_deinit (proc); emacs_gnutls_deinit (proc);
...@@ -1421,13 +1421,13 @@ one trustfile (usually a CA bundle). */) ...@@ -1421,13 +1421,13 @@ one trustfile (usually a CA bundle). */)
return Qnil; return Qnil;
} }
hostname = Fplist_get (proplist, QCgnutls_bootprop_hostname); hostname = Fplist_get (proplist, QChostname);
priority_string = Fplist_get (proplist, QCgnutls_bootprop_priority); priority_string = Fplist_get (proplist, QCpriority);
trustfiles = Fplist_get (proplist, QCgnutls_bootprop_trustfiles); trustfiles = Fplist_get (proplist, QCtrustfiles);
keylist = Fplist_get (proplist, QCgnutls_bootprop_keylist); keylist = Fplist_get (proplist, QCkeylist);
crlfiles = Fplist_get (proplist, QCgnutls_bootprop_crlfiles); crlfiles = Fplist_get (proplist, QCcrlfiles);
loglevel = Fplist_get (proplist, QCgnutls_bootprop_loglevel); loglevel = Fplist_get (proplist, QCloglevel);
prime_bits = Fplist_get (proplist, QCgnutls_bootprop_min_prime_bits); prime_bits = Fplist_get (proplist, QCmin_prime_bits);
if (!STRINGP (hostname)) if (!STRINGP (hostname))
{ {
...@@ -1477,7 +1477,7 @@ one trustfile (usually a CA bundle). */) ...@@ -1477,7 +1477,7 @@ one trustfile (usually a CA bundle). */)
check_memory_full (gnutls_certificate_allocate_credentials (&x509_cred)); check_memory_full (gnutls_certificate_allocate_credentials (&x509_cred));
XPROCESS (proc)->gnutls_x509_cred = x509_cred; XPROCESS (proc)->gnutls_x509_cred = x509_cred;
verify_flags = Fplist_get (proplist, QCgnutls_bootprop_verify_flags); verify_flags = Fplist_get (proplist, QCverify_flags);
if (NUMBERP (verify_flags)) if (NUMBERP (verify_flags))
{ {
gnutls_verify_flags = XINT (verify_flags); gnutls_verify_flags = XINT (verify_flags);
...@@ -1653,7 +1653,7 @@ one trustfile (usually a CA bundle). */) ...@@ -1653,7 +1653,7 @@ one trustfile (usually a CA bundle). */)
} }
XPROCESS (proc)->gnutls_complete_negotiation_p = XPROCESS (proc)->gnutls_complete_negotiation_p =
!NILP (Fplist_get (proplist, QCgnutls_complete_negotiation)); !NILP (Fplist_get (proplist, QCcomplete_negotiation));
GNUTLS_INITSTAGE (proc) = GNUTLS_STAGE_CRED_SET; GNUTLS_INITSTAGE (proc) = GNUTLS_STAGE_CRED_SET;
ret = emacs_gnutls_handshake (XPROCESS (proc)); ret = emacs_gnutls_handshake (XPROCESS (proc));
if (ret < GNUTLS_E_SUCCESS) if (ret < GNUTLS_E_SUCCESS)
...@@ -1700,14 +1700,14 @@ DEFUN ("gnutls-available-p", Fgnutls_available_p, Sgnutls_available_p, 0, 0, 0, ...@@ -1700,14 +1700,14 @@ DEFUN ("gnutls-available-p", Fgnutls_available_p, Sgnutls_available_p, 0, 0, 0,
{ {
#ifdef HAVE_GNUTLS #ifdef HAVE_GNUTLS
# ifdef WINDOWSNT # ifdef WINDOWSNT
Lisp_Object found = Fassq (Qgnutls_dll, Vlibrary_cache); Lisp_Object found = Fassq (Qgnutls, Vlibrary_cache);
if (CONSP (found)) if (CONSP (found))
return XCDR (found); return XCDR (found);
else else
{ {
Lisp_Object status; Lisp_Object status;
status = init_gnutls_functions () ? Qt : Qnil; status = init_gnutls_functions () ? Qt : Qnil;
Vlibrary_cache = Fcons (Fcons (Qgnutls_dll, status), Vlibrary_cache); Vlibrary_cache = Fcons (Fcons (Qgnutls, status), Vlibrary_cache);
return status; return status;
} }
# else /* !WINDOWSNT */ # else /* !WINDOWSNT */
...@@ -1739,16 +1739,16 @@ syms_of_gnutls (void) ...@@ -1739,16 +1739,16 @@ syms_of_gnutls (void)
DEFSYM (Qgnutls_x509pki, "gnutls-x509pki"); DEFSYM (Qgnutls_x509pki, "gnutls-x509pki");
/* The following are for the property list of 'gnutls-boot'. */ /* The following are for the property list of 'gnutls-boot'. */
DEFSYM (QCgnutls_bootprop_hostname, ":hostname"); DEFSYM (QChostname, ":hostname");
DEFSYM (QCgnutls_bootprop_priority, ":priority"); DEFSYM (QCpriority, ":priority");
DEFSYM (QCgnutls_bootprop_trustfiles, ":trustfiles"); DEFSYM (QCtrustfiles, ":trustfiles");
DEFSYM (QCgnutls_bootprop_keylist, ":keylist"); DEFSYM (QCkeylist, ":keylist");
DEFSYM (QCgnutls_bootprop_crlfiles, ":crlfiles"); DEFSYM (QCcrlfiles, ":crlfiles");
DEFSYM (QCgnutls_bootprop_min_prime_bits, ":min-prime-bits"); DEFSYM (QCmin_prime_bits, ":min-prime-bits");
DEFSYM (QCgnutls_bootprop_loglevel, ":loglevel"); DEFSYM (QCloglevel, ":loglevel");
DEFSYM (QCgnutls_complete_negotiation, ":complete-negotiation"); DEFSYM (QCcomplete_negotiation, ":complete-negotiation");
DEFSYM (QCgnutls_bootprop_verify_flags, ":verify-flags"); DEFSYM (QCverify_flags, ":verify-flags");
DEFSYM (QCgnutls_bootprop_verify_error, ":verify-error"); DEFSYM (QCverify_error, ":verify-error");
DEFSYM (Qgnutls_e_interrupted, "gnutls-e-interrupted"); DEFSYM (Qgnutls_e_interrupted, "gnutls-e-interrupted");
Fput (Qgnutls_e_interrupted, Qgnutls_code, Fput (Qgnutls_e_interrupted, Qgnutls_code,
......
...@@ -224,7 +224,7 @@ static EMACS_INT current_sampling_interval; ...@@ -224,7 +224,7 @@ static EMACS_INT current_sampling_interval;
static void static void
handle_profiler_signal (int signal) handle_profiler_signal (int signal)
{ {
if (EQ (backtrace_top_function (), Qautomatic_gc)) if (EQ (backtrace_top_function (), QAutomatic_GC))
/* Special case the time-count inside GC because the hash-table /* Special case the time-count inside GC because the hash-table
code is not prepared to be used while the GC is running. code is not prepared to be used while the GC is running.
More specifically it uses ASIZE at many places where it does More specifically it uses ASIZE at many places where it does
...@@ -418,7 +418,7 @@ Before returning, a new log is allocated for future samples. */) ...@@ -418,7 +418,7 @@ Before returning, a new log is allocated for future samples. */)
cpu_log = (profiler_cpu_running cpu_log = (profiler_cpu_running
? make_log (profiler_log_size, profiler_max_stack_depth) ? make_log (profiler_log_size, profiler_max_stack_depth)
: Qnil); : Qnil);
Fputhash (Fmake_vector (make_number (1), Qautomatic_gc), Fputhash (Fmake_vector (make_number (1), QAutomatic_GC),
make_number (cpu_gc_count), make_number (cpu_gc_count),
result); result);
cpu_gc_count = 0; cpu_gc_count = 0;
......
...@@ -5246,7 +5246,8 @@ x_default_font_parameter (struct frame *f, Lisp_Object parms) ...@@ -5246,7 +5246,8 @@ x_default_font_parameter (struct frame *f, Lisp_Object parms)
{ {
/* Remember the explicit font parameter, so we can re-apply it after /* Remember the explicit font parameter, so we can re-apply it after
we've applied the `default' face settings. */ we've applied the `default' face settings. */
x_set_frame_parameters (f, Fcons (Fcons (Qfont_param, font_param), Qnil)); x_set_frame_parameters (f, Fcons (Fcons (Qfont_parameter, font_param),
Qnil));
} }
x_default_parameter (f, parms, Qfont, font, "font", "Font", RES_TYPE_STRING); x_default_parameter (f, parms, Qfont, font, "font", "Font", RES_TYPE_STRING);
} }
...@@ -9711,7 +9712,7 @@ syms_of_w32fns (void) ...@@ -9711,7 +9712,7 @@ syms_of_w32fns (void)
DEFSYM (Qctrl, "ctrl"); DEFSYM (Qctrl, "ctrl");
DEFSYM (Qcontrol, "control"); DEFSYM (Qcontrol, "control");
DEFSYM (Qshift, "shift"); DEFSYM (Qshift, "shift");
DEFSYM (Qfont_param, "font-parameter");