diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/editfns.c | 14 | ||||
| -rw-r--r-- | src/process.c | 1 |
2 files changed, 11 insertions, 4 deletions
diff --git a/src/editfns.c b/src/editfns.c index 4fe50ac31d7..c00457b0a5c 100644 --- a/src/editfns.c +++ b/src/editfns.c @@ -4179,6 +4179,7 @@ styled_format (ptrdiff_t nargs, Lisp_Object *args, bool message) multibyte character of the previous string. This flag tells if we must consider such a situation or not. */ bool maybe_combine_byte; + Lisp_Object val; bool arg_intervals = false; USE_SAFE_ALLOCA; sa_avail -= sizeof initial_buffer; @@ -4417,7 +4418,10 @@ styled_format (ptrdiff_t nargs, Lisp_Object *args, bool message) { if (format == end && format - format_start == 2 && ! string_intervals (args[0])) - return arg; + { + val = arg; + goto return_val; + } /* handle case (precision[n] >= 0) */ @@ -4862,11 +4866,14 @@ styled_format (ptrdiff_t nargs, Lisp_Object *args, bool message) emacs_abort (); if (! new_result) - return args[0]; + { + val = args[0]; + goto return_val; + } if (maybe_combine_byte) nchars = multibyte_chars_in_text ((unsigned char *) buf, p - buf); - Lisp_Object val = make_specified_string (buf, nchars, p - buf, multibyte); + val = make_specified_string (buf, nchars, p - buf, multibyte); /* If the format string has text properties, or any of the string arguments has text properties, set up text properties of the @@ -4964,6 +4971,7 @@ styled_format (ptrdiff_t nargs, Lisp_Object *args, bool message) } } + return_val: /* If we allocated BUF or INFO with malloc, free it too. */ SAFE_FREE (); diff --git a/src/process.c b/src/process.c index 2733fa39113..05feba73253 100644 --- a/src/process.c +++ b/src/process.c @@ -8097,7 +8097,6 @@ syms_of_process (void) DEFSYM (Qreal, "real"); DEFSYM (Qnetwork, "network"); DEFSYM (Qserial, "serial"); - DEFSYM (Qpipe, "pipe"); DEFSYM (QCbuffer, ":buffer"); DEFSYM (QChost, ":host"); DEFSYM (QCservice, ":service"); |