comparison src/callint.c @ 306:9ea74add5d37 r21-0b51

Import from CVS: tag r21-0b51
author cvs
date Mon, 13 Aug 2007 10:41:58 +0200
parents c42ec1d1cded
children cc15677e0335
comparison
equal deleted inserted replaced
305:18920a7e9a86 306:9ea74add5d37
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 Lisp_Object tem = Fread_key_sequence (PROMPT (), Qnil, Qnil); 718 struct gcpro ngcpro1;
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
719 visargs[argnum] = Fkey_description (tem); 726 visargs[argnum] = Fkey_description (tem);
720 /* The following makes `describe-key' not work with 727 /* The following makes `describe-key' not work with
721 extent-local keymaps and such; and anyway, it's 728 extent-local keymaps and such; and anyway, it's
722 contrary to the documentation. */ 729 contrary to the documentation. */
723 /* args[argnum] = call1 (Qevents_to_keys, tem); */ 730 /* args[argnum] = call1 (Qevents_to_keys, tem); */
726 break; 733 break;
727 } 734 }
728 case 'K': /* Key sequence (vector of events), 735 case 'K': /* Key sequence (vector of events),
729 no automatic downcasing */ 736 no automatic downcasing */
730 { 737 {
731 Lisp_Object tem = Fread_key_sequence (PROMPT (), Qnil, Qt); 738 struct gcpro ngcpro1;
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
732 visargs[argnum] = Fkey_description (tem); 746 visargs[argnum] = Fkey_description (tem);
733 /* The following makes `describe-key' not work with 747 /* The following makes `describe-key' not work with
734 extent-local keymaps and such; and anyway, it's 748 extent-local keymaps and such; and anyway, it's
735 contrary to the documentation. */ 749 contrary to the documentation. */
736 /* args[argnum] = call1 (Qevents_to_keys, tem); */ 750 /* args[argnum] = call1 (Qevents_to_keys, tem); */