diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/alloc.c | 5 | ||||
| -rw-r--r-- | src/dbusbind.c | 4 | ||||
| -rw-r--r-- | src/floatfns.c | 4 | ||||
| -rw-r--r-- | src/xfaces.c | 4 |
4 files changed, 11 insertions, 6 deletions
diff --git a/src/alloc.c b/src/alloc.c index 3feed51b1e..8173615992 100644 --- a/src/alloc.c +++ b/src/alloc.c @@ -486,6 +486,11 @@ static void *pure_alloc (size_t, int); ? ((x) + (y) - 1) - ((x) + (y) - 1) % (y) \ : ((x) + (y) - 1) & ~ ((y) - 1)) +/* Bug#23764 */ +#ifdef ALIGN +# undef ALIGN +#endif + /* Return PTR rounded up to the next multiple of ALIGNMENT. */ static void * diff --git a/src/dbusbind.c b/src/dbusbind.c index 618176dd45..7a94c81eea 100644 --- a/src/dbusbind.c +++ b/src/dbusbind.c @@ -943,7 +943,7 @@ xd_get_connection_references (DBusConnection *connection) static DBusConnection* xd_lisp_dbus_to_dbus (Lisp_Object bus) { - return (DBusConnection *) (intptr_t) XFASTINT (bus); + return (DBusConnection *) XSAVE_POINTER (bus, 0); } /* Return D-Bus connection address. BUS is either a Lisp symbol, @@ -1186,7 +1186,7 @@ this connection to those buses. */) XD_SIGNAL1 (build_string ("Cannot add watch functions")); /* Add bus to list of registered buses. */ - XSETFASTINT (val, (intptr_t) connection); + val = make_save_ptr (connection); xd_registered_buses = Fcons (Fcons (bus, val), xd_registered_buses); /* Cleanup. */ diff --git a/src/floatfns.c b/src/floatfns.c index c1bd25877e..f514fcbea8 100644 --- a/src/floatfns.c +++ b/src/floatfns.c @@ -185,8 +185,8 @@ If X is zero, both parts (SGNFCAND and EXP) are zero. */) } DEFUN ("ldexp", Fldexp, Sldexp, 2, 2, 0, - doc: /* Return X * 2**EXP, as a floating point number. -EXP must be an integer. */) + doc: /* Return SGNFCAND * 2**EXPONENT, as a floating point number. +EXPONENT must be an integer. */) (Lisp_Object sgnfcand, Lisp_Object exponent) { CHECK_NUMBER (exponent); diff --git a/src/xfaces.c b/src/xfaces.c index de73c010d5..ea02ee7ccb 100644 --- a/src/xfaces.c +++ b/src/xfaces.c @@ -6494,8 +6494,8 @@ REPLACEMENT is a face specification, i.e. one of the following: (3) a list in which each element has the form of (1) or (2). List values for REPLACEMENT are merged to form the final face -specification, with earlier entries taking precedence, in the same as -as in the `face' text property. +specification, with earlier entries taking precedence, in the same way +as with the `face' text property. Face-name remapping cycles are suppressed; recursive references use the underlying face instead of the remapped face. So a remapping of |