1 files changed, 25 insertions, 2 deletions

diff --git a/src/minibuf.c b/src/minibuf.c
index 0b8b00ce2c9..d2a4c9b9538 100644
--- a/src/minibuf.c
+++ b/src/minibuf.c
@@ -630,8 +630,31 @@ 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);
-        Fadd_text_properties (make_number (BEG), make_number (PT),
-                              Vminibuffer_prompt_properties, Qnil);
+        if (Fconsp (Vminibuffer_prompt_properties))
+          {
+            /* We want to apply all properties from
+               `minibuffer-prompt-properties' to the region normally,
+               but if the `face' property is present, add that
+               property to the end of the face properties to avoid
+               overwriting faces. */
+            Lisp_Object list = Vminibuffer_prompt_properties;
+            while (CONSP (list))
+              {
+                Lisp_Object key = XCAR (list);
+                list = XCDR (list);
+                if (CONSP (list))
+                  {
+                    Lisp_Object val = XCAR (list);
+                    list = XCDR (list);
+                    if (EQ (key, Qface))
+                      Fadd_face_text_property (make_number (BEG),
+                                               make_number (PT), val, Qt, Qnil);
+                    else
+                      Fput_text_property (make_number (BEG), make_number (PT),
+                                          key, val, Qnil);
+                  }
+              }
+          }
       }
     unbind_to (count1, Qnil);
   }