Mercurial > hg > xemacs-beta

comparison src/minibuf.c @ 110:fe104dbd9147 r20-1b7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Import from CVS: tag r20-1b7
author cvs
date Mon, 13 Aug 2007 09:19:45 +0200
parents 1ce6082ce73f
children 9f59509498e1
comparison
equal deleted inserted replaced
109:e183fc049578 110:fe104dbd9147
48 /* The echo area buffer. */ 48 /* The echo area buffer. */
49 Lisp_Object Vecho_area_buffer; 49 Lisp_Object Vecho_area_buffer;
50 50
51 /* Prompt to display in front of the minibuffer contents */ 51 /* Prompt to display in front of the minibuffer contents */
52 Lisp_Object Vminibuf_prompt; 52 Lisp_Object Vminibuf_prompt;
53
54 /* Added on 97/3/14 by Jareth Hein (jhod@po.iijnet.or.jp) for input system support */
55 /* String to be displayed in front of prompt of the minibuffer contents */
56 Lisp_Object Vminibuf_preprompt;
53 57
54 /* Hook to run just after entry to minibuffer. */ 58 /* Hook to run just after entry to minibuffer. */
55 Lisp_Object Qminibuffer_setup_hook, Vminibuffer_setup_hook; 59 Lisp_Object Qminibuffer_setup_hook, Vminibuffer_setup_hook;
56 60
57 Lisp_Object Qappend_message, Qcurrent_message_label, 61 Lisp_Object Qappend_message, Qcurrent_message_label,
104 } 108 }
105 109
106 return Qnil; 110 return Qnil;
107 } 111 }
108 112
113 /* 97/4/13 jhod: Added for input methods */
114 DEFUN ("set-minibuffer-preprompt", Fset_minibuffer_preprompt, 1, 1, 0, /*
115 Set the minibuffer preprompt string to PREPROMPT. This is used by language
116 input methods to relay state information to the user.
117 */
118 (preprompt))
119 {
120 if (NILP (preprompt))
121 {
122 Vminibuf_preprompt = Qnil;
123 }
124 else
125 {
126 CHECK_STRING (preprompt);
127
128 Vminibuf_preprompt = LISP_GETTEXT (preprompt);
129 }
130 }
131
109 DEFUN ("read-minibuffer-internal", Fread_minibuffer_internal, 1, 1, 0, /* 132 DEFUN ("read-minibuffer-internal", Fread_minibuffer_internal, 1, 1, 0, /*
110 Lowest-level interface to minibuffers. Don't call this. 133 Lowest-level interface to minibuffers. Don't call this.
111 */ 134 */
112 (prompt)) 135 (prompt))
113 { 136 {
230 regexps = XCDR (regexps)) 253 regexps = XCDR (regexps))
231 { 254 {
232 Lisp_Object re = XCAR (regexps); 255 Lisp_Object re = XCAR (regexps);
233 if (STRINGP (re) 256 if (STRINGP (re)
234 && (fast_string_match (re, nonreloc, reloc, offset, 257 && (fast_string_match (re, nonreloc, reloc, offset,
235 length, 0, ERROR_ME, 0) >= 0)) 258 length, 0, ERROR_ME, 0) < 0))
236 return (1); 259 return (1);
237 } 260 }
238 } 261 }
239 return (0); 262 return (0);
240 } 263 }
863 DEFSUBR (Fminibuffer_depth); 886 DEFSUBR (Fminibuffer_depth);
864 #if 0 887 #if 0
865 DEFSUBR (Fminibuffer_prompt); 888 DEFSUBR (Fminibuffer_prompt);
866 DEFSUBR (Fminibuffer_prompt_width); 889 DEFSUBR (Fminibuffer_prompt_width);
867 #endif 890 #endif
868 891 DEFSUBR (Fset_minibuffer_preprompt);
869 DEFSUBR (Fread_minibuffer_internal); 892 DEFSUBR (Fread_minibuffer_internal);
870 893
871 DEFSUBR (Ftry_completion); 894 DEFSUBR (Ftry_completion);
872 DEFSUBR (Fall_completions); 895 DEFSUBR (Fall_completions);
873 896
883 minibuf_level = 0; 906 minibuf_level = 0;
884 907
885 staticpro (&Vminibuf_prompt); 908 staticpro (&Vminibuf_prompt);
886 Vminibuf_prompt = Qnil; 909 Vminibuf_prompt = Qnil;
887 910
911 /* Added by Jareth Hein (jhod@po.iijnet.or.jp) for input system support */
912 staticpro (&Vminibuf_preprompt);
913 Vminibuf_preprompt = Qnil;
914
888 DEFVAR_LISP ("minibuffer-setup-hook", &Vminibuffer_setup_hook /* 915 DEFVAR_LISP ("minibuffer-setup-hook", &Vminibuffer_setup_hook /*
889 Normal hook run just after entry to minibuffer. 916 Normal hook run just after entry to minibuffer.
890 */ ); 917 */ );
891 Vminibuffer_setup_hook = Qnil; 918 Vminibuffer_setup_hook = Qnil;
892 919
893 DEFVAR_BOOL ("completion-ignore-case", &completion_ignore_case /* 920 DEFVAR_BOOL ("completion-ignore-case", &completion_ignore_case /*
894 Non-nil means don't consider case significant in completion. 921 Non-nil means don't consider case significant in completion.
895 */ ); 922 */ );
896 completion_ignore_case = 0; 923 completion_ignore_case = 0;
897 924
898 /* Worthless doc string */
899 DEFVAR_LISP ("completion-regexp-list", &Vcompletion_regexp_list /* 925 DEFVAR_LISP ("completion-regexp-list", &Vcompletion_regexp_list /*
900 List of regexps that should restrict possible completions. 926 List of regexps that should restrict possible completions.
927 Each completion has to match all regexps in this list.
901 */ ); 928 */ );
902 Vcompletion_regexp_list = Qnil; 929 Vcompletion_regexp_list = Qnil;
903 } 930 }
904 931
905 void 932 void