Merge from origin/emacs-27

8e8b46ef81 (origin/emacs-27) More accurate documentation of the "r" i...
dcb2015a5b Mention the GNU Kind Communications Guidelines in the FAQ
9882e63eea ; * CONTRIBUTE: Another wording change regarding tiny chan...
850f18ef23 Allow newlines in password prompts again in comint
c977370dd7 Avoid point movement when visiting image files
da64a257a4 ; * CONTRIBUTE: Yet another clarification of significant c...
d03f2a6ee9 Avoid assertion violation in callproc.c
dcc00bbb19 ; * CONTRIBUTE: Clarify the "15-lines" rule a bit more.

1 files changed, 5 insertions, 1 deletions

diff --git a/src/callproc.c b/src/callproc.c
index cb72b070b7b..cd0f67fe29b 100644
--- a/src/callproc.c
+++ b/src/callproc.c
@@ -411,7 +411,11 @@ call_process (ptrdiff_t nargs, Lisp_Object *args, int filefd,
       /* If the buffer is (still) a list, it might be a (:file "file") spec. */
       if (CONSP (buffer) && EQ (XCAR (buffer), QCfile))
         {
-          output_file = Fexpand_file_name (XCAR (XCDR (buffer)),
+          Lisp_Object ofile = XCDR (buffer);
+          if (CONSP (ofile))
+            ofile = XCAR (ofile);
+          CHECK_STRING (ofile);
+          output_file = Fexpand_file_name (ofile,
                                            BVAR (current_buffer, directory));
           CHECK_STRING (output_file);
           buffer = Qnil;