Merge from origin/emacs-25

[gnu-emacs] / src / minibuf.c

diff --git a/src/minibuf.c b/src/minibuf.c
index d2a4c9b95383ed0af71b000b2fef8a0b5a551f4c..75831618ea5b41dd36ab19a6f9f478d1b3e2e8de 100644 (file)
--- a/src/minibuf.c
+++ b/src/minibuf.c
@@ -630,7 +630,7 @@ read_minibuf (Lisp_Object map, Lisp_Object initial, Lisp_Object prompt,
                            Qrear_nonsticky, Qt, Qnil);
        Fput_text_property (make_number (BEG), make_number (PT),
                            Qfield, Qt, Qnil);
-       if (Fconsp (Vminibuffer_prompt_properties))
+       if (CONSP (Vminibuffer_prompt_properties))
          {
            /* We want to apply all properties from
               `minibuffer-prompt-properties' to the region normally,