* textprop.c (Qminibuffer_prompt): New variable.

(syms_of_textprop): Initialize it.
* callint.c (Fcall_interactively): For `c', `k', and `K' prompt
in minibuffer-prompt face.  (Bug#1662)

diff --git a/src/ChangeLog b/src/ChangeLog
index fbf378dd6de24d17ff8e76a1f77a8c0b067cb2a4..4d4a7a51b20b264119da2c80be2f8af8cf2cf338 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,10 @@
+2008-12-26  Martin Rudalics  <rudalics@gmx.at>
+
+       * textprop.c (Qminibuffer_prompt): New variable.
+       (syms_of_textprop): Initialize it.
+       * callint.c (Fcall_interactively): For `c', `k', and `K' prompt
+       in minibuffer-prompt face.  (Bug#1662)
+
 2008-12-25  Jason Rumney  <jasonr@gnu.org>
 
        * buffer.c (Fbuffer_swap_text): Use POINTER_TYPE.

diff --git a/src/callint.c b/src/callint.c
index 467790ce6cf3c7ab4b987ad60d1818cd45681559..1c64457582192b0c8c920e20c18b93711bcfa1d1 100644 (file)
--- a/src/callint.c
+++ b/src/callint.c
@@ -45,6 +45,7 @@ extern Lisp_Object Vthis_original_command, real_this_command;
 
 Lisp_Object Vcommand_debug_status, Qcommand_debug_status;
 Lisp_Object Qenable_recursive_minibuffers;
+extern Lisp_Object Qface, Qminibuffer_prompt;
 
 /* Non-nil means treat the mark as active
    even if mark_active is 0.  */
@@ -541,6 +542,10 @@ invoke it.  If KEYS is omitted or nil, the return value of
          break;
 
         case 'c':              /* Character */
+         /* Prompt in `minibuffer-prompt' face.  */
+         Fput_text_property (make_number (0),
+                             make_number (SCHARS (callint_message)),
+                             Qface, Qminibuffer_prompt, callint_message);
          args[i] = Fread_char (callint_message, Qnil, Qnil);
          message1_nolog ((char *) 0);
          /* Passing args[i] directly stimulates compiler bug */
@@ -594,6 +599,10 @@ invoke it.  If KEYS is omitted or nil, the return value of
          {
            int speccount1 = SPECPDL_INDEX ();
            specbind (Qcursor_in_echo_area, Qt);
+           /* Prompt in `minibuffer-prompt' face.  */
+           Fput_text_property (make_number (0),
+                               make_number (SCHARS (callint_message)),
+                               Qface, Qminibuffer_prompt, callint_message);
            args[i] = Fread_key_sequence (callint_message,
                                          Qnil, Qnil, Qnil, Qnil);
            unbind_to (speccount1, Qnil);
@@ -622,6 +631,10 @@ invoke it.  If KEYS is omitted or nil, the return value of
          {
            int speccount1 = SPECPDL_INDEX ();
            specbind (Qcursor_in_echo_area, Qt);
+           /* Prompt in `minibuffer-prompt' face.  */
+           Fput_text_property (make_number (0),
+                               make_number (SCHARS (callint_message)),
+                               Qface, Qminibuffer_prompt, callint_message);
            args[i] = Fread_key_sequence (callint_message,
                                          Qnil, Qt, Qnil, Qnil);
            teml = args[i];

diff --git a/src/textprop.c b/src/textprop.c
index 120c42843febc4d887791abe74942f36cfe9ad74..35d92c953570a52a1544c80682dd8a5d10835c1c 100644 (file)
--- a/src/textprop.c
+++ b/src/textprop.c
@@ -57,6 +57,7 @@ Lisp_Object Qlocal_map;
 /* Visual properties text (including strings) may have.  */
 Lisp_Object Qforeground, Qbackground, Qfont, Qunderline, Qstipple;
 Lisp_Object Qinvisible, Qread_only, Qintangible, Qmouse_face;
+Lisp_Object Qminibuffer_prompt;
 
 /* Sticky properties */
 Lisp_Object Qfront_sticky, Qrear_nonsticky;
@@ -2334,6 +2335,8 @@ inherits it if NONSTICKINESS is nil.  The `front-sticky' and
   Qrear_nonsticky = intern ("rear-nonsticky");
   staticpro (&Qmouse_face);
   Qmouse_face = intern ("mouse-face");
+  staticpro (&Qminibuffer_prompt);
+  Qminibuffer_prompt = intern ("minibuffer-prompt");
 
   /* Properties that text might use to specify certain actions */