[Emacs-diffs] emacs/src ChangeLog callint.c textprop.c

[Martin Rudalics]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Martin Rudalics <m061211>       08/12/26 09:39:52

Modified files:
        src            : ChangeLog callint.c textprop.c 

Log message:
        * 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)

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/src/ChangeLog?cvsroot=emacs&r1=1.7227&r2=1.7228
http://cvs.savannah.gnu.org/viewcvs/emacs/src/callint.c?cvsroot=emacs&r1=1.167&r2=1.168
http://cvs.savannah.gnu.org/viewcvs/emacs/src/textprop.c?cvsroot=emacs&r1=1.163&r2=1.164

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/src/ChangeLog,v
retrieving revision 1.7227
retrieving revision 1.7228
diff -u -b -r1.7227 -r1.7228
--- ChangeLog   25 Dec 2008 10:33:33 -0000      1.7227
+++ ChangeLog   26 Dec 2008 09:39:49 -0000      1.7228
@@ -1,3 +1,10 @@
+2008-12-26  Martin Rudalics  <address@hidden>
+
+       * 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  <address@hidden>
 
        * buffer.c (Fbuffer_swap_text): Use POINTER_TYPE.

Index: callint.c
===================================================================
RCS file: /sources/emacs/emacs/src/callint.c,v
retrieving revision 1.167
retrieving revision 1.168
diff -u -b -r1.167 -r1.168
--- callint.c   14 May 2008 07:49:11 -0000      1.167
+++ callint.c   26 Dec 2008 09:39:51 -0000      1.168
@@ -45,6 +45,7 @@
 
 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 @@
          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 @@
          {
            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 @@
          {
            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];

Index: textprop.c
===================================================================
RCS file: /sources/emacs/emacs/src/textprop.c,v
retrieving revision 1.163
retrieving revision 1.164
diff -u -b -r1.163 -r1.164
--- textprop.c  3 Nov 2008 17:31:22 -0000       1.163
+++ textprop.c  26 Dec 2008 09:39:51 -0000      1.164
@@ -57,6 +57,7 @@
 /* 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 @@
   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 */