diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2011-03-06 16:22:16 -0500 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2011-03-06 16:22:16 -0500 |
| commit | 0d6459dfb52188481bfd6bb53f1b2f653ecd6a5d (patch) | |
| tree | 306b87fc2903ad23343f3c84be1cccfa72e5a97e /src/minibuf.c | |
| parent | 798cb64441228d473f7bdd213183c70fb582595c (diff) | |
| parent | 892777baa1739fa5f1f2d1c2975488c3e6f57bae (diff) | |
| download | emacs-0d6459dfb52188481bfd6bb53f1b2f653ecd6a5d.tar.gz | |
Merge from trunk
Diffstat (limited to 'src/minibuf.c')
| -rw-r--r-- | src/minibuf.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/src/minibuf.c b/src/minibuf.c index 9852900b60b..75a24686d5a 100644 --- a/src/minibuf.c +++ b/src/minibuf.c @@ -82,6 +82,15 @@ Lisp_Object Qcase_fold_search; Lisp_Object Qread_expression_history; +/* Prompt to display in front of the mini-buffer contents. */ + +static Lisp_Object minibuf_prompt; + +/* Width of current mini-buffer prompt. Only set after display_line + of the line that contains the prompt. */ + +static EMACS_INT minibuf_prompt_width; + /* Put minibuf on currently selected frame's minibuffer. We do this whenever the user starts a new minibuffer @@ -623,7 +632,7 @@ read_minibuf (Lisp_Object map, Lisp_Object initial, Lisp_Object prompt, unbind_to (count1, Qnil); } - minibuf_prompt_width = (int) current_column (); /* iftc */ + minibuf_prompt_width = current_column (); /* Put in the initial input. */ if (!NILP (initial)) |