aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMartin Rudalics2008-12-26 09:39:49 +0000
committerMartin Rudalics2008-12-26 09:39:49 +0000
commit54b33868432b9727a27ce9fe4698ace9da120631 (patch)
treeef56969724a772a7ea8b70173788820dedf6de91 /src
parentb5c3fb2111792133b2c5a788145efaa8101602bf (diff)
downloademacs-54b33868432b9727a27ce9fe4698ace9da120631.tar.gz
emacs-54b33868432b9727a27ce9fe4698ace9da120631.zip
* 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)
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog7
-rw-r--r--src/callint.c13
-rw-r--r--src/textprop.c3
3 files changed, 23 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index fbf378dd6de..4d4a7a51b20 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,10 @@
12008-12-26 Martin Rudalics <rudalics@gmx.at>
2
3 * textprop.c (Qminibuffer_prompt): New variable.
4 (syms_of_textprop): Initialize it.
5 * callint.c (Fcall_interactively): For `c', `k', and `K' prompt
6 in minibuffer-prompt face. (Bug#1662)
7
12008-12-25 Jason Rumney <jasonr@gnu.org> 82008-12-25 Jason Rumney <jasonr@gnu.org>
2 9
3 * buffer.c (Fbuffer_swap_text): Use POINTER_TYPE. 10 * buffer.c (Fbuffer_swap_text): Use POINTER_TYPE.
diff --git a/src/callint.c b/src/callint.c
index 467790ce6cf..1c644575821 100644
--- a/src/callint.c
+++ b/src/callint.c
@@ -45,6 +45,7 @@ extern Lisp_Object Vthis_original_command, real_this_command;
45 45
46Lisp_Object Vcommand_debug_status, Qcommand_debug_status; 46Lisp_Object Vcommand_debug_status, Qcommand_debug_status;
47Lisp_Object Qenable_recursive_minibuffers; 47Lisp_Object Qenable_recursive_minibuffers;
48extern Lisp_Object Qface, Qminibuffer_prompt;
48 49
49/* Non-nil means treat the mark as active 50/* Non-nil means treat the mark as active
50 even if mark_active is 0. */ 51 even if mark_active is 0. */
@@ -541,6 +542,10 @@ invoke it. If KEYS is omitted or nil, the return value of
541 break; 542 break;
542 543
543 case 'c': /* Character */ 544 case 'c': /* Character */
545 /* Prompt in `minibuffer-prompt' face. */
546 Fput_text_property (make_number (0),
547 make_number (SCHARS (callint_message)),
548 Qface, Qminibuffer_prompt, callint_message);
544 args[i] = Fread_char (callint_message, Qnil, Qnil); 549 args[i] = Fread_char (callint_message, Qnil, Qnil);
545 message1_nolog ((char *) 0); 550 message1_nolog ((char *) 0);
546 /* Passing args[i] directly stimulates compiler bug */ 551 /* Passing args[i] directly stimulates compiler bug */
@@ -594,6 +599,10 @@ invoke it. If KEYS is omitted or nil, the return value of
594 { 599 {
595 int speccount1 = SPECPDL_INDEX (); 600 int speccount1 = SPECPDL_INDEX ();
596 specbind (Qcursor_in_echo_area, Qt); 601 specbind (Qcursor_in_echo_area, Qt);
602 /* Prompt in `minibuffer-prompt' face. */
603 Fput_text_property (make_number (0),
604 make_number (SCHARS (callint_message)),
605 Qface, Qminibuffer_prompt, callint_message);
597 args[i] = Fread_key_sequence (callint_message, 606 args[i] = Fread_key_sequence (callint_message,
598 Qnil, Qnil, Qnil, Qnil); 607 Qnil, Qnil, Qnil, Qnil);
599 unbind_to (speccount1, Qnil); 608 unbind_to (speccount1, Qnil);
@@ -622,6 +631,10 @@ invoke it. If KEYS is omitted or nil, the return value of
622 { 631 {
623 int speccount1 = SPECPDL_INDEX (); 632 int speccount1 = SPECPDL_INDEX ();
624 specbind (Qcursor_in_echo_area, Qt); 633 specbind (Qcursor_in_echo_area, Qt);
634 /* Prompt in `minibuffer-prompt' face. */
635 Fput_text_property (make_number (0),
636 make_number (SCHARS (callint_message)),
637 Qface, Qminibuffer_prompt, callint_message);
625 args[i] = Fread_key_sequence (callint_message, 638 args[i] = Fread_key_sequence (callint_message,
626 Qnil, Qt, Qnil, Qnil); 639 Qnil, Qt, Qnil, Qnil);
627 teml = args[i]; 640 teml = args[i];
diff --git a/src/textprop.c b/src/textprop.c
index 120c42843fe..35d92c95357 100644
--- a/src/textprop.c
+++ b/src/textprop.c
@@ -57,6 +57,7 @@ Lisp_Object Qlocal_map;
57/* Visual properties text (including strings) may have. */ 57/* Visual properties text (including strings) may have. */
58Lisp_Object Qforeground, Qbackground, Qfont, Qunderline, Qstipple; 58Lisp_Object Qforeground, Qbackground, Qfont, Qunderline, Qstipple;
59Lisp_Object Qinvisible, Qread_only, Qintangible, Qmouse_face; 59Lisp_Object Qinvisible, Qread_only, Qintangible, Qmouse_face;
60Lisp_Object Qminibuffer_prompt;
60 61
61/* Sticky properties */ 62/* Sticky properties */
62Lisp_Object Qfront_sticky, Qrear_nonsticky; 63Lisp_Object Qfront_sticky, Qrear_nonsticky;
@@ -2334,6 +2335,8 @@ inherits it if NONSTICKINESS is nil. The `front-sticky' and
2334 Qrear_nonsticky = intern ("rear-nonsticky"); 2335 Qrear_nonsticky = intern ("rear-nonsticky");
2335 staticpro (&Qmouse_face); 2336 staticpro (&Qmouse_face);
2336 Qmouse_face = intern ("mouse-face"); 2337 Qmouse_face = intern ("mouse-face");
2338 staticpro (&Qminibuffer_prompt);
2339 Qminibuffer_prompt = intern ("minibuffer-prompt");
2337 2340
2338 /* Properties that text might use to specify certain actions */ 2341 /* Properties that text might use to specify certain actions */
2339 2342