mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-12-16 09:50:25 +00:00
Code Issues Releases Activity

(Vread_expression_map): Define here.

Browse Source 
(Qread_expression_history): New variable.
(syms_of_minibuf): Initialize them.
(Feval_minibuffer): Use Vread_expression_map and Qread_expression_history.
This commit is contained in:
Richard M. Stallman 2006-10-21 17:40:03 +00:00
parent cd987aaa0a
commit 627fb581ae
2 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/ChangeLog
View File

@ -1,3 +1,11 @@
2006-10-21 Richard Stallman <rms@gnu.org>
* minibuf.c (Vread_expression_map): Define here.
(Qread_expression_history): New variable.
(syms_of_minibuf): Initialize them.
(Feval_minibuffer): Use Vread_expression_map and
Qread_expression_history.
2006-10-21 Kenichi Handa <handa@m17n.org>
* xfns.c (xic_create_fontsetname): If ADSTYLE field is not a wild

18
src/minibuf.c
View File

@ -132,7 +132,8 @@ int minibuffer_auto_raise;
static Lisp_Object last_exact_completion;
extern Lisp_Object Voverriding_local_map;
/* Keymap for reading expressions. */
Lisp_Object Vread_expression_map;
Lisp_Object Quser_variable_p;
@ -142,6 +143,10 @@ Lisp_Object Qcurrent_input_method, Qactivate_input_method;
Lisp_Object Qcase_fold_search;
Lisp_Object Qread_expression_history;
extern Lisp_Object Voverriding_local_map;
extern Lisp_Object Qmouse_face;
extern Lisp_Object Qfield;
@ -1040,7 +1045,9 @@ arguments are used as in `read-from-minibuffer'.) */)
(prompt, initial_contents)
Lisp_Object prompt, initial_contents;
{
return Feval (Fread_minibuffer (prompt, initial_contents));
return Feval (read_minibuf (Vread_expression_map, initial_contents,
prompt, Qnil, 1, Qread_expression_history,
make_number (0), Qnil, 0, 0));
}
/* Functions that use the minibuffer to read various things. */
@ -2808,6 +2815,9 @@ syms_of_minibuf ()
Qcase_fold_search = intern ("case-fold-search");
staticpro (&Qcase_fold_search);
Qread_expression_history = intern ("read-expression-history");
staticpro (&Qread_expression_history);
DEFVAR_LISP ("read-buffer-function", &Vread_buffer_function,
doc: /* If this is non-nil, `read-buffer' does its work by calling this function. */);
Vread_buffer_function = Qnil;
@ -2933,6 +2943,10 @@ properties. */);
Vminibuffer_prompt_properties
= Fcons (intern ("read-only"), Fcons (Qt, Qnil));
DEFVAR_LISP ("read-expression-map", &Vread_expression_map,
doc: /* Minibuffer keymap used for reading Lisp expressions. */);
Vread_expression_map = Qnil;
defsubr (&Sset_minibuffer_window);
defsubr (&Sread_from_minibuffer);
defsubr (&Seval_minibuffer);