comparison src/callint.c @ 70:131b0175ea99 r20-0b30

Import from CVS: tag r20-0b30
author cvs
date Mon, 13 Aug 2007 09:02:59 +0200
parents 56c54cf7c5b6
children 25f70ba0133c
comparison
equal deleted inserted replaced
69:804d1389bcd6 70:131b0175ea99
71 Lisp_Object Qread_expression; 71 Lisp_Object Qread_expression;
72 Lisp_Object Qread_command; 72 Lisp_Object Qread_command;
73 Lisp_Object Qread_number; 73 Lisp_Object Qread_number;
74 Lisp_Object Qread_string; 74 Lisp_Object Qread_string;
75 Lisp_Object Qevents_to_keys; 75 Lisp_Object Qevents_to_keys;
76
77 #ifdef MULE
78 Lisp_Object Qread_coding_system;
79 Lisp_Object Qread_non_nil_coding_system;
80 #endif
76 81
77 /* ARGSUSED */ 82 /* ARGSUSED */
78 DEFUN ("interactive", Finteractive, 0, UNEVALLED, 0, /* 83 DEFUN ("interactive", Finteractive, 0, UNEVALLED, 0, /*
79 Specify a way of parsing arguments for interactive use of a function. 84 Specify a way of parsing arguments for interactive use of a function.
80 For example, write 85 For example, write
120 s -- Any string. 125 s -- Any string.
121 S -- Any symbol. 126 S -- Any symbol.
122 v -- Variable name: symbol that is user-variable-p. 127 v -- Variable name: symbol that is user-variable-p.
123 x -- Lisp expression read but not evaluated. 128 x -- Lisp expression read but not evaluated.
124 X -- Lisp expression read and evaluated. 129 X -- Lisp expression read and evaluated.
130 z -- Coding system. (Always nil if no Mule support.)
131 Z -- Coding system, nil if no prefix arg. (Always nil if no Mule support.)
125 In addition, if the string begins with `*' 132 In addition, if the string begins with `*'
126 then an error is signaled if the buffer is read-only. 133 then an error is signaled if the buffer is read-only.
127 This happens before reading any arguments. 134 This happens before reading any arguments.
128 If the string begins with `@', then the window the mouse is over is selected 135 If the string begins with `@', then the window the mouse is over is selected
129 before anything else is done. 136 before anything else is done.
738 break; 745 break;
739 } 746 }
740 case 'n': /* Read number from minibuffer. */ 747 case 'n': /* Read number from minibuffer. */
741 { 748 {
742 read_number: 749 read_number:
743 args[argnum] = call2 (Qread_number, PROMPT (), Qnil); 750 args[argnum] = call2 (Qread_number, PROMPT (), Qt);
744 /* numbers are too boring to go on command history */ 751 /* numbers are too boring to go on command history */
745 /* arg_from_tty = 1; */ 752 /* arg_from_tty = 1; */
746 break; 753 break;
747 } 754 }
748 case 'N': /* Prefix arg, else number from minibuffer */ 755 case 'N': /* Prefix arg, else number from minibuffer */
842 /* visargs[argnum] = Fprin1_to_string (tem, Qnil); */ 849 /* visargs[argnum] = Fprin1_to_string (tem, Qnil); */
843 args[argnum] = Feval (tem); 850 args[argnum] = Feval (tem);
844 arg_from_tty = 1; 851 arg_from_tty = 1;
845 break; 852 break;
846 } 853 }
854 case 'Z': /* Coding-system symbol or nil if no prefix */
855 {
856 #ifdef MULE
857 if (NILP (prefix))
858 {
859 args[argnum] = Qnil;
860 }
861 else
862 {
863 args[argnum] =
864 call1 (Qread_non_nil_coding_system, PROMPT ());
865 arg_from_tty = 1;
866 }
867 #else
868 args[argnum] = Qnil;
869 #endif
870 break;
871 }
872 case 'z': /* Coding-system symbol */
873 {
874 #ifdef MULE
875 args[argnum] = call1 (Qread_coding_system, PROMPT ());
876 arg_from_tty = 1;
877 #else
878 args[argnum] = Qnil;
879 #endif
880 break;
881 }
847 882
848 /* We have a case for `+' so we get an error 883 /* We have a case for `+' so we get an error
849 if anyone tries to define one here. */ 884 if anyone tries to define one here. */
850 case '+': 885 case '+':
851 default: 886 default:
941 defsymbol (&Qread_variable, "read-variable"); 976 defsymbol (&Qread_variable, "read-variable");
942 defsymbol (&Qread_function, "read-function"); 977 defsymbol (&Qread_function, "read-function");
943 defsymbol (&Qread_command, "read-command"); 978 defsymbol (&Qread_command, "read-command");
944 defsymbol (&Qread_number, "read-number"); 979 defsymbol (&Qread_number, "read-number");
945 defsymbol (&Qread_expression, "read-expression"); 980 defsymbol (&Qread_expression, "read-expression");
981 #ifdef MULE
982 defsymbol (&Qread_coding_system, "read-coding-system");
983 defsymbol (&Qread_non_nil_coding_system, "read-non-nil-coding-system");
984 #endif
946 defsymbol (&Qevents_to_keys, "events-to-keys"); 985 defsymbol (&Qevents_to_keys, "events-to-keys");
947 defsymbol (&Qcommand_debug_status, "command-debug-status"); 986 defsymbol (&Qcommand_debug_status, "command-debug-status");
948 defsymbol (&Qenable_recursive_minibuffers, "enable-recursive-minibuffers"); 987 defsymbol (&Qenable_recursive_minibuffers, "enable-recursive-minibuffers");
949 defsymbol (&Qcommand_debug_status, "command-debug-status"); 988 defsymbol (&Qcommand_debug_status, "command-debug-status");
950 defsymbol (&Quser_variable_p, "user-variable-p"); 989 defsymbol (&Quser_variable_p, "user-variable-p");