comparison src/callint.c @ 371:cc15677e0335 r21-2b1

Import from CVS: tag r21-2b1
author cvs
date Mon, 13 Aug 2007 11:03:08 +0200
parents 9ea74add5d37
children 6240c7796c7a
comparison
equal deleted inserted replaced
370:bd866891f083 371:cc15677e0335
713 args[argnum] = Qnil; 713 args[argnum] = Qnil;
714 break; 714 break;
715 } 715 }
716 case 'k': /* Key sequence (vector of events) */ 716 case 'k': /* Key sequence (vector of events) */
717 { 717 {
718 struct gcpro ngcpro1; 718 Lisp_Object tem = Fread_key_sequence (PROMPT (), Qnil, Qnil);
719 Lisp_Object tem;
720 Lisp_Object key_prompt = PROMPT ();
721
722 NGCPRO1(key_prompt);
723 tem = Fread_key_sequence (key_prompt, Qnil, Qnil);
724 NUNGCPRO;
725
726 visargs[argnum] = Fkey_description (tem); 719 visargs[argnum] = Fkey_description (tem);
727 /* The following makes `describe-key' not work with 720 /* The following makes `describe-key' not work with
728 extent-local keymaps and such; and anyway, it's 721 extent-local keymaps and such; and anyway, it's
729 contrary to the documentation. */ 722 contrary to the documentation. */
730 /* args[argnum] = call1 (Qevents_to_keys, tem); */ 723 /* args[argnum] = call1 (Qevents_to_keys, tem); */
733 break; 726 break;
734 } 727 }
735 case 'K': /* Key sequence (vector of events), 728 case 'K': /* Key sequence (vector of events),
736 no automatic downcasing */ 729 no automatic downcasing */
737 { 730 {
738 struct gcpro ngcpro1; 731 Lisp_Object tem = Fread_key_sequence (PROMPT (), Qnil, Qt);
739 Lisp_Object tem;
740 Lisp_Object key_prompt = PROMPT ();
741
742 NGCPRO1(key_prompt);
743 tem = Fread_key_sequence (key_prompt, Qnil, Qt);
744 NUNGCPRO;
745
746 visargs[argnum] = Fkey_description (tem); 732 visargs[argnum] = Fkey_description (tem);
747 /* The following makes `describe-key' not work with 733 /* The following makes `describe-key' not work with
748 extent-local keymaps and such; and anyway, it's 734 extent-local keymaps and such; and anyway, it's
749 contrary to the documentation. */ 735 contrary to the documentation. */
750 /* args[argnum] = call1 (Qevents_to_keys, tem); */ 736 /* args[argnum] = call1 (Qevents_to_keys, tem); */