/* Minibuffer input and completion.
- Copyright (C) 1985, 1986, 1993, 1994 Free Software Foundation, Inc.
+ Copyright (C) 1985, 1986, 1993, 1994, 1995 Free Software Foundation, Inc.
This file is part of GNU Emacs.
#include "frame.h"
#include "window.h"
#include "syntax.h"
+#include "keyboard.h"
#define min(a, b) ((a) < (b) ? (a) : (b))
/* Non-nil means it is the window for C-M-v to scroll
when the minibuffer is selected. */
extern Lisp_Object Vminibuf_scroll_window;
+
+extern Lisp_Object Voverriding_local_map;
+\f
+/* Put minibuf on currently selected frame's minibuffer.
+ We do this whenever the user starts a new minibuffer
+ or when a minibuffer exits. */
+
+void
+choose_minibuf_frame ()
+{
+ if (selected_frame != 0
+ && !EQ (minibuf_window, selected_frame->minibuffer_window))
+ {
+#if defined(MSDOS) && !defined(HAVE_X_WINDOWS)
+ selected_frame->minibuffer_window = minibuf_window;
+#else
+ /* I don't think that any frames may validly have a null minibuffer
+ window anymore. */
+ if (NILP (selected_frame->minibuffer_window))
+ abort ();
+
+ Fset_window_buffer (selected_frame->minibuffer_window,
+ XWINDOW (minibuf_window)->buffer);
+ minibuf_window = selected_frame->minibuffer_window;
+#endif
+ }
+}
\f
/* Actual minibuffer invocation. */
with initial position HISTPOS. (BACKUP_N should be <= 0.)
Normally return the result as a string (the text that was read),
- but if EXPFLAG is non-nil, read it and return the object read.
+ but if EXPFLAG is nonzero, read it and return the object read.
If HISTVAR is given, save the value read on that history only if it doesn't
match the front of that history list exactly. The value is pushed onto
- the list as the string that was read, or as the object that resulted iff
- EXPFLAG is non-nil. */
+ the list as the string that was read. */
Lisp_Object
read_minibuf (map, initial, prompt, backup_n, expflag, histvar, histpos)
Lisp_Object histvar;
Lisp_Object histpos;
{
- register Lisp_Object val;
+ Lisp_Object val;
int count = specpdl_ptr - specpdl;
Lisp_Object mini_frame;
+ struct gcpro gcpro1, gcpro2, gcpro3;
- if (XTYPE (prompt) != Lisp_String)
- prompt = build_string ("");
+ single_kboard_state ();
- /* Emacs in -batch mode calls minibuffer: print the prompt. */
- if (noninteractive && XTYPE (prompt) == Lisp_String)
- printf ("%s", XSTRING (prompt)->data);
+ val = Qnil;
+ /* Don't need to protect PROMPT, HISTVAR, and HISTPOS because we
+ store them away before we can GC. Don't need to protect
+ BACKUP_N because we use the value only if it is an integer. */
+ GCPRO3 (map, initial, val);
+
+ if (!STRINGP (prompt))
+ prompt = build_string ("");
if (!enable_recursive_minibuffers
&& minibuf_level > 0
&& (EQ (selected_window, minibuf_window)))
-#if 0
- || selected_frame != XFRAME (WINDOW_FRAME (XWINDOW (minibuf_window)))
-#endif
error ("Command attempted to use minibuffer while in minibuffer");
/* Could we simply bind these variables instead? */
+ minibuf_save_list
+ = Fcons (Voverriding_local_map,
+ Fcons (minibuf_window, minibuf_save_list));
minibuf_save_list
= Fcons (minibuf_prompt,
Fcons (make_number (minibuf_prompt_width),
Fcons (Vminibuffer_history_position,
Fcons (Vminibuffer_history_variable,
minibuf_save_list))))));
- minibuf_prompt_width = 0;
+
+ minibuf_prompt_width = 0; /* xdisp.c puts in the right value. */
+ minibuf_prompt = Fcopy_sequence (prompt);
+ Vminibuffer_history_position = histpos;
+ Vminibuffer_history_variable = histvar;
+
+ choose_minibuf_frame ();
record_unwind_protect (Fset_window_configuration,
Fcurrent_window_configuration (Qnil));
/* If the minibuffer window is on a different frame, save that
frame's configuration too. */
#ifdef MULTI_FRAME
- XSET (mini_frame, Lisp_Frame, WINDOW_FRAME (XWINDOW (minibuf_window)));
+ mini_frame = WINDOW_FRAME (XWINDOW (minibuf_window));
if (XFRAME (mini_frame) != selected_frame)
record_unwind_protect (Fset_window_configuration,
Fcurrent_window_configuration (mini_frame));
up Emacs and buf's default directory is Qnil. Here's a hack; can
you think of something better to do? Find another buffer with a
better directory, and use that one instead. */
- if (XTYPE (val) == Lisp_String)
+ if (STRINGP (val))
current_buffer->directory = val;
else
{
Lisp_Object other_buf;
other_buf = XCONS (XCONS (buf_list)->car)->cdr;
- if (XTYPE (XBUFFER (other_buf)->directory) == Lisp_String)
+ if (STRINGP (XBUFFER (other_buf)->directory))
{
current_buffer->directory = XBUFFER (other_buf)->directory;
break;
Vminibuf_scroll_window = selected_window;
Fset_window_buffer (minibuf_window, Fcurrent_buffer ());
Fselect_window (minibuf_window);
- XFASTINT (XWINDOW (minibuf_window)->hscroll) = 0;
+ XSETFASTINT (XWINDOW (minibuf_window)->hscroll, 0);
Ferase_buffer ();
minibuf_level++;
if (!NILP (initial))
{
Finsert (1, &initial);
- if (!NILP (backup_n) && XTYPE (backup_n) == Lisp_Int)
+ if (!NILP (backup_n) && INTEGERP (backup_n))
Fforward_char (backup_n);
}
- minibuf_prompt = Fcopy_sequence (prompt);
echo_area_glyphs = 0;
/* This is in case the minibuffer-setup-hook calls Fsit_for. */
previous_echo_glyphs = 0;
Vhelp_form = Vminibuffer_help_form;
current_buffer->keymap = map;
- Vminibuffer_history_position = histpos;
- Vminibuffer_history_variable = histvar;
/* Run our hook, but not if it is empty.
(run-hooks would do nothing if it is empty,
}
/* Make minibuffer contents into a string */
- val = make_buffer_string (1, Z);
+ val = make_buffer_string (1, Z, 1);
+#if 0 /* make_buffer_string should handle the gap. */
bcopy (GAP_END_ADDR, XSTRING (val)->data + GPT - BEG, Z - GPT);
+#endif
/* VAL is the string of minibuffer text. */
last_minibuf_string = val;
- /* Add the value to the appropriate history list. */
- if (XTYPE (Vminibuffer_history_variable) == Lisp_Symbol
+ /* Add the value to the appropriate history list unless it is empty. */
+ if (XSTRING (val)->size != 0
+ && SYMBOLP (Vminibuffer_history_variable)
&& ! EQ (XSYMBOL (Vminibuffer_history_variable)->value, Qunbound))
{
/* If the caller wanted to save the value read on a history list,
val = Fcar (expr_and_pos);
}
- return unbind_to (count, val); /* The appropriate frame will get selected
- in set-window-configuration. */
+ /* The appropriate frame will get selected
+ in set-window-configuration. */
+ RETURN_UNGCPRO (unbind_to (count, val));
}
/* Return a buffer to be used as the minibuffer at depth `depth'.
char name[24];
extern Lisp_Object nconc2 ();
- XFASTINT (num) = depth;
+ XSETFASTINT (num, depth);
tail = Fnthcdr (num, Vminibuffer_list);
if (NILP (tail))
{
XCONS (tail)->car = buf;
}
else
- reset_buffer (XBUFFER (buf));
+ {
+ int count = specpdl_ptr - specpdl;
+
+ reset_buffer (XBUFFER (buf));
+ record_unwind_protect (Fset_buffer, Fcurrent_buffer ());
+ Fset_buffer (buf);
+ Fkill_all_local_variables ();
+ unbind_to (count, Qnil);
+ }
return buf;
}
read_minibuf_unwind (data)
Lisp_Object data;
{
+ Lisp_Object old_deactivate_mark;
+
/* We are exiting the minibuffer one way or the other,
so run the hook. */
if (!NILP (Vminibuffer_exit_hook) && !EQ (Vminibuffer_exit_hook, Qunbound)
&& !NILP (Vrun_hooks))
- call1 (Vrun_hooks, Qminibuffer_exit_hook);
+ safe_run_hooks (Qminibuffer_exit_hook);
/* Erase the minibuffer we were using at this level. */
Fset_buffer (XWINDOW (minibuf_window)->buffer);
/* Prevent error in erase-buffer. */
current_buffer->read_only = Qnil;
+
+ old_deactivate_mark = Vdeactivate_mark;
Ferase_buffer ();
+ Vdeactivate_mark = old_deactivate_mark;
/* If this was a recursive minibuffer,
tie the minibuffer window back to the outer level minibuffer buffer */
minibuf_level--;
/* Make sure minibuffer window is erased, not ignored */
windows_or_buffers_changed++;
- XFASTINT (XWINDOW (minibuf_window)->last_modified) = 0;
+ XSETFASTINT (XWINDOW (minibuf_window)->last_modified, 0);
/* Restore prompt, etc from outer minibuffer */
minibuf_prompt = Fcar (minibuf_save_list);
minibuf_save_list = Fcdr (minibuf_save_list);
Vminibuffer_history_variable = Fcar (minibuf_save_list);
minibuf_save_list = Fcdr (minibuf_save_list);
+ Voverriding_local_map = Fcar (minibuf_save_list);
+ minibuf_save_list = Fcdr (minibuf_save_list);
+ minibuf_window = Fcar (minibuf_save_list);
+ minibuf_save_list = Fcdr (minibuf_save_list);
}
\f
CHECK_STRING (prompt, 0);
if (!NILP (initial_contents))
{
- if (XTYPE (initial_contents) == Lisp_Cons)
+ if (CONSP (initial_contents))
{
position = Fcdr (initial_contents);
initial_contents = Fcar (initial_contents);
else
keymap = get_keymap (keymap,2);
- if (XTYPE (hist) == Lisp_Symbol)
+ if (SYMBOLP (hist))
{
histvar = hist;
histpos = Qnil;
if (NILP (histvar))
histvar = Qminibuffer_history;
if (NILP (histpos))
- XFASTINT (histpos) = 0;
+ XSETFASTINT (histpos, 0);
return read_minibuf (keymap, initial_contents, prompt,
make_number (pos), !NILP (read), histvar, histpos);
/* Functions that use the minibuffer to read various things. */
-DEFUN ("read-string", Fread_string, Sread_string, 1, 2, 0,
+DEFUN ("read-string", Fread_string, Sread_string, 1, 3, 0,
"Read a string from the minibuffer, prompting with string PROMPT.\n\
-If non-nil second arg INITIAL-INPUT is a string to insert before reading.")
- (prompt, initial_input)
- Lisp_Object prompt, initial_input;
+If non-nil, second arg INITIAL-INPUT is a string to insert before reading.\n\
+The third arg HISTORY, if non-nil, specifies a history list\n\
+ and optionally the initial position in the list.\n\
+See `read-from-minibuffer' for details of HISTORY argument.")
+ (prompt, initial_input, history)
+ Lisp_Object prompt, initial_input, history;
{
- return Fread_from_minibuffer (prompt, initial_input, Qnil, Qnil, Qnil);
+ return Fread_from_minibuffer (prompt, initial_input, Qnil, Qnil, history);
}
DEFUN ("read-no-blanks-input", Fread_no_blanks_input, Sread_no_blanks_input, 1, 2, 0,
Lisp_Object args[3];
struct gcpro gcpro1;
- if (XTYPE (def) == Lisp_Buffer)
+ if (BUFFERP (def))
def = XBUFFER (def)->name;
if (!NILP (def))
{
If optional third argument PREDICATE is non-nil,\n\
it is used to test each possible match.\n\
The match is a candidate only if PREDICATE returns non-nil.\n\
-The argument given to PREDICATE is the alist element or the symbol from the obarray.")
+The argument given to PREDICATE is the alist element\n\
+or the symbol from the obarray.")
(string, alist, pred)
Lisp_Object string, alist, pred;
{
struct gcpro gcpro1, gcpro2, gcpro3, gcpro4;
CHECK_STRING (string, 0);
- if (!list && XTYPE (alist) != Lisp_Vector)
+ if (!list && !VECTORP (alist))
return call3 (alist, string, pred, Qnil);
bestmatch = Qnil;
if (XSYMBOL (bucket)->next)
XSETSYMBOL (bucket, XSYMBOL (bucket)->next);
else
- XFASTINT (bucket) = 0;
+ XSETFASTINT (bucket, 0);
}
else if (++index >= obsize)
break;
/* Is this element a possible completion? */
- if (XTYPE (eltstring) == Lisp_String
+ if (STRINGP (eltstring)
&& XSTRING (string)->size <= XSTRING (eltstring)->size
&& 0 > scmp (XSTRING (eltstring)->data, XSTRING (string)->data,
XSTRING (string)->size))
/* Yes. */
Lisp_Object regexps;
Lisp_Object zero;
- XFASTINT (zero) = 0;
+ XSETFASTINT (zero, 0);
/* Ignore this element if it fails to match all the regexps. */
for (regexps = Vcompletion_regexp_list; CONSP (regexps);
bestmatchsize))
return Qt;
- XFASTINT (zero) = 0; /* Else extract the part in which */
- XFASTINT (end) = bestmatchsize; /* all completions agree */
+ XSETFASTINT (zero, 0); /* Else extract the part in which */
+ XSETFASTINT (end, bestmatchsize); /* all completions agree */
return Fsubstring (bestmatch, zero, end);
}
Return -1 if strings match,
else number of chars that match at the beginning. */
+int
scmp (s1, s2, len)
- register char *s1, *s2;
+ register unsigned char *s1, *s2;
int len;
{
register int l = len;
}
if (l == 0)
return -1;
- else return len - l;
+ else
+ return len - l;
}
\f
-DEFUN ("all-completions", Fall_completions, Sall_completions, 2, 3, 0,
+DEFUN ("all-completions", Fall_completions, Sall_completions, 2, 4, 0,
"Search for partial matches to STRING in ALIST.\n\
Each car of each element of ALIST is tested to see if it begins with STRING.\n\
The value is a list of all the strings from ALIST that match.\n\
+\n\
ALIST can be an obarray instead of an alist.\n\
Then the print names of all symbols in the obarray are the possible matches.\n\
\n\
If optional third argument PREDICATE is non-nil,\n\
it is used to test each possible match.\n\
The match is a candidate only if PREDICATE returns non-nil.\n\
-The argument given to PREDICATE is the alist element or the symbol from the obarray.")
- (string, alist, pred)
- Lisp_Object string, alist, pred;
+The argument given to PREDICATE is the alist element\n\
+or the symbol from the obarray.\n\
+\n\
+If the optional fourth argument HIDE-SPACES is non-nil,\n\
+strings in ALIST that start with a space\n\
+are ignored unless STRING itself starts with a space.")
+ (string, alist, pred, hide_spaces)
+ Lisp_Object string, alist, pred, hide_spaces;
{
Lisp_Object tail, elt, eltstring;
Lisp_Object allmatches;
struct gcpro gcpro1, gcpro2, gcpro3, gcpro4;
CHECK_STRING (string, 0);
- if (!list && XTYPE (alist) != Lisp_Vector)
+ if (!list && !VECTORP (alist))
{
return call3 (alist, string, pred, Qt);
}
if (XSYMBOL (bucket)->next)
XSETSYMBOL (bucket, XSYMBOL (bucket)->next);
else
- XFASTINT (bucket) = 0;
+ XSETFASTINT (bucket, 0);
}
else if (++index >= obsize)
break;
/* Is this element a possible completion? */
- if (XTYPE (eltstring) == Lisp_String
+ if (STRINGP (eltstring)
&& XSTRING (string)->size <= XSTRING (eltstring)->size
- /* Reject alternatives that start with space
+ /* If HIDE_SPACES, reject alternatives that start with space
unless the input starts with space. */
&& ((XSTRING (string)->size > 0 && XSTRING (string)->data[0] == ' ')
- || XSTRING (eltstring)->data[0] != ' ')
+ || XSTRING (eltstring)->data[0] != ' '
+ || NILP (hide_spaces))
&& 0 > scmp (XSTRING (eltstring)->data, XSTRING (string)->data,
XSTRING (string)->size))
{
/* Yes. */
Lisp_Object regexps;
Lisp_Object zero;
- XFASTINT (zero) = 0;
+ XSETFASTINT (zero, 0);
/* Ignore this element if it fails to match all the regexps. */
for (regexps = Vcompletion_regexp_list; CONSP (regexps);
PROMPT is a string to prompt with; normally it ends in a colon and a space.\n\
TABLE is an alist whose elements' cars are strings, or an obarray.\n\
PREDICATE limits completion to a subset of TABLE.\n\
-See `try-completion' for more details on completion, TABLE, and PREDICATE.\n\
+See `try-completion' and `all-completions' for more details
+ on completion, TABLE, and PREDICATE.\n\
+\n\
If REQUIRE-MATCH is non-nil, the user is not allowed to exit unless\n\
- the input is (or completes to) an element of TABLE.\n\
+ the input is (or completes to) an element of TABLE or is null.\n\
If it is also not t, Return does not exit if it does non-null completion.\n\
+If the input is null, `completing-read' returns nil,\n\
+ regardless of the value of REQUIRE-MATCH.\n\
+\n\
If INITIAL-INPUT is non-nil, insert it in the minibuffer initially.\n\
If it is (STRING . POSITION), the initial input\n\
is STRING, but point is placed POSITION characters into the string.\n\
position = Qnil;
if (!NILP (init))
{
- if (XTYPE (init) == Lisp_Cons)
+ if (CONSP (init))
{
position = Fcdr (init);
init = Fcar (init);
}
}
- if (XTYPE (hist) == Lisp_Symbol)
+ if (SYMBOLP (hist))
{
histvar = hist;
histpos = Qnil;
if (NILP (histvar))
histvar = Qminibuffer_history;
if (NILP (histpos))
- XFASTINT (histpos) = 0;
+ XSETFASTINT (histpos, 0);
val = read_minibuf (NILP (require_match)
? Vminibuffer_local_completion_map
char *m;
{
int osize = ZV;
+ int opoint = PT;
Lisp_Object oinhibit;
oinhibit = Vinhibit_quit;
SET_PT (osize);
insert_string (m);
- SET_PT (osize);
+ SET_PT (opoint);
Vinhibit_quit = Qt;
Fsit_for (make_number (2), Qnil, Qnil);
- del_range (PT, ZV);
+ del_range (osize, ZV);
+ SET_PT (opoint);
if (!NILP (Vquit_flag))
{
Vquit_flag = Qnil;
Lisp_Object Fminibuffer_completion_help ();
Lisp_Object assoc_for_completion ();
+/* A subroutine of Fintern_soft. */
+extern Lisp_Object oblookup ();
+
+
+/* Test whether TXT is an exact completion. */
+Lisp_Object
+test_completion (txt)
+ Lisp_Object txt;
+{
+ Lisp_Object tem;
+
+ if (CONSP (Vminibuffer_completion_table)
+ || NILP (Vminibuffer_completion_table))
+ return assoc_for_completion (txt, Vminibuffer_completion_table);
+ else if (VECTORP (Vminibuffer_completion_table))
+ {
+ /* Bypass intern-soft as that loses for nil */
+ tem = oblookup (Vminibuffer_completion_table,
+ XSTRING (txt)->data, XSTRING (txt)->size);
+ if (!SYMBOLP (tem))
+ return Qnil;
+ else if (!NILP (Vminibuffer_completion_predicate))
+ return call1 (Vminibuffer_completion_predicate, tem);
+ else
+ return Qt;
+ }
+ else
+ return call3 (Vminibuffer_completion_table, txt,
+ Vminibuffer_completion_predicate, Qlambda);
+}
/* returns:
* 0 no possible completion
}
/* It did find a match. Do we match some possibility exactly now? */
- if (CONSP (Vminibuffer_completion_table)
- || NILP (Vminibuffer_completion_table))
- tem = assoc_for_completion (Fbuffer_string (),
- Vminibuffer_completion_table);
- else if (XTYPE (Vminibuffer_completion_table) == Lisp_Vector)
- {
- /* the primitive used by Fintern_soft */
- extern Lisp_Object oblookup ();
-
- tem = Fbuffer_string ();
- /* Bypass intern-soft as that loses for nil */
- tem = oblookup (Vminibuffer_completion_table,
- XSTRING (tem)->data, XSTRING (tem)->size);
- if (XTYPE (tem) != Lisp_Symbol)
- tem = Qnil;
- else if (!NILP (Vminibuffer_completion_predicate))
- tem = call1 (Vminibuffer_completion_predicate, tem);
- else
- tem = Qt;
- }
- else
- tem = call3 (Vminibuffer_completion_table,
- Fbuffer_string (),
- Vminibuffer_completion_predicate,
- Qlambda);
-
+ tem = test_completion (Fbuffer_string ());
if (NILP (tem))
{
/* not an exact match */
elt = Fcar (tail);
if (!CONSP (elt)) continue;
thiscar = Fcar (elt);
- if (XTYPE (thiscar) != Lisp_String)
+ if (!STRINGP (thiscar))
continue;
if (completion_ignore_case)
thiscar = Fupcase (thiscar);
/* If the previous command was not this, then mark the completion
buffer obsolete. */
- if (! EQ (last_command, this_command))
+ if (! EQ (current_kboard->Vlast_command, this_command))
Vminibuf_scroll_window = Qnil;
window = Vminibuf_scroll_window;
return Qt;
}
+\f
+/* Subroutines of Fminibuffer_complete_and_exit. */
+
+/* This one is called by internal_condition_case to do the real work. */
+
+Lisp_Object
+complete_and_exit_1 ()
+{
+ return make_number (do_completion ());
+}
+
+/* This one is called by internal_condition_case if an error happens.
+ Pretend the current value is an exact match. */
+
+Lisp_Object
+complete_and_exit_2 (ignore)
+ Lisp_Object ignore;
+{
+ return make_number (1);
+}
DEFUN ("minibuffer-complete-and-exit", Fminibuffer_complete_and_exit,
Sminibuffer_complete_and_exit, 0, 0, "",
- "Complete the minibuffer contents, and maybe exit.\n\
-Exit if the name is valid with no completion needed.\n\
-If name was completed to a valid match,\n\
+ "If the minibuffer contents is a valid completion then exit.\n\
+Otherwise try to complete it. If completion leads to a valid completion,\n\
a repetition of this command will exit.")
()
{
register int i;
+ Lisp_Object val;
/* Allow user to specify null string */
if (BEGV == ZV)
goto exit;
- i = do_completion ();
+ if (!NILP (test_completion (Fbuffer_string ())))
+ goto exit;
+
+ /* Call do_completion, but ignore errors. */
+ val = internal_condition_case (complete_and_exit_1, Qerror,
+ complete_and_exit_2);
+
+ i = XFASTINT (val);
switch (i)
{
case 1:
Vminibuffer_completion_predicate);
UNGCPRO;
- if (XTYPE (tem) == Lisp_String)
+ if (STRINGP (tem))
completion = tem;
else
{
Vminibuffer_completion_predicate);
UNGCPRO;
- if (XTYPE (tem) == Lisp_String)
+ if (STRINGP (tem))
completion = tem;
}
}
(completions)
Lisp_Object completions;
{
- register Lisp_Object tail, elt;
+ Lisp_Object tail, elt;
register int i;
int column = 0;
- /* No GCPRO needed, since (when it matters) every variable
- points to a non-string that is pointed to by COMPLETIONS. */
+ struct gcpro gcpro1, gcpro2;
struct buffer *old = current_buffer;
- if (XTYPE (Vstandard_output) == Lisp_Buffer)
+ int first = 1;
+
+ /* Note that (when it matters) every variable
+ points to a non-string that is pointed to by COMPLETIONS,
+ except for ELT. ELT can be pointing to a string
+ when terpri or Findent_to calls a change hook. */
+ elt = Qnil;
+ GCPRO2 (completions, elt);
+
+ if (BUFFERP (Vstandard_output))
set_buffer_internal (XBUFFER (Vstandard_output));
if (NILP (completions))
write_string ("Possible completions are:", -1);
for (tail = completions, i = 0; !NILP (tail); tail = Fcdr (tail), i++)
{
- /* this needs fixing for the case of long completions
- and/or narrow windows */
- /* Sadly, the window it will appear in is not known
- until after the text has been made. */
- if (i & 1)
+ Lisp_Object tem;
+ int length;
+ Lisp_Object startpos, endpos;
+
+ elt = Fcar (tail);
+ /* Compute the length of this element. */
+ if (CONSP (elt))
+ {
+ tem = Fcar (elt);
+ CHECK_STRING (tem, 0);
+ length = XINT (XSTRING (tem)->size);
+
+ tem = Fcar (Fcdr (elt));
+ CHECK_STRING (tem, 0);
+ length += XINT (XSTRING (tem)->size);
+ }
+ else
+ {
+ CHECK_STRING (elt, 0);
+ length = XINT (XSTRING (elt)->size);
+ }
+
+ /* This does a bad job for narrower than usual windows.
+ Sadly, the window it will appear in is not known
+ until after the text has been made. */
+
+ if (BUFFERP (Vstandard_output))
+ XSETINT (startpos, BUF_PT (XBUFFER (Vstandard_output)));
+
+ /* If the previous completion was very wide,
+ or we have two on this line already,
+ don't put another on the same line. */
+ if (column > 33 || first
+ /* If this is really wide, don't put it second on a line. */
+ || column > 0 && length > 45)
{
- if (XTYPE (Vstandard_output) == Lisp_Buffer)
- Findent_to (make_number (35), make_number (2));
+ Fterpri (Qnil);
+ column = 0;
+ }
+ /* Otherwise advance to column 35. */
+ else
+ {
+ if (BUFFERP (Vstandard_output))
+ {
+ tem = Findent_to (make_number (35), make_number (2));
+
+ column = XINT (tem);
+ }
else
{
do
while (column < 35);
}
}
- else
+
+ if (BUFFERP (Vstandard_output))
{
- Fterpri (Qnil);
- column = 0;
+ XSETINT (endpos, BUF_PT (XBUFFER (Vstandard_output)));
+ Fset_text_properties (startpos, endpos,
+ Qnil, Vstandard_output);
}
- elt = Fcar (tail);
+
+ /* Output this element and update COLUMN. */
if (CONSP (elt))
{
- if (XTYPE (Vstandard_output) != Lisp_Buffer)
- {
- Lisp_Object tem;
- tem = Flength (Fcar (elt));
- column += XINT (tem);
- tem = Flength (Fcar (Fcdr (elt)));
- column += XINT (tem);
- }
Fprinc (Fcar (elt), Qnil);
Fprinc (Fcar (Fcdr (elt)), Qnil);
}
else
+ Fprinc (elt, Qnil);
+
+ column += length;
+
+ /* If output is to a buffer, recompute COLUMN in a way
+ that takes account of character widths. */
+ if (BUFFERP (Vstandard_output))
{
- if (XTYPE (Vstandard_output) != Lisp_Buffer)
- {
- Lisp_Object tem;
- tem = Flength (elt);
- column += XINT (tem);
- }
- Fprinc (elt, Qnil);
+ tem = Fcurrent_column ();
+ column = XINT (tem);
}
+
+ first = 0;
}
}
- if (XTYPE (Vstandard_output) == Lisp_Buffer)
+ UNGCPRO;
+
+ if (BUFFERP (Vstandard_output))
set_buffer_internal (old);
if (!NILP (Vrun_hooks))
message ("Making completion list...");
completions = Fall_completions (Fbuffer_string (),
Vminibuffer_completion_table,
- Vminibuffer_completion_predicate);
+ Vminibuffer_completion_predicate,
+ Qt);
echo_area_glyphs = 0;
if (NILP (completions))
"Terminate minibuffer input.")
()
{
- if (XTYPE (last_command_char) == Lisp_Int)
+ if (INTEGERP (last_command_char))
internal_self_insert (last_command_char, 0);
else
bitch_at_user ();
()
{
Lisp_Object width;
- XFASTINT (width) = minibuf_prompt_width;
+ XSETFASTINT (width, minibuf_prompt_width);
return width;
}
\f
DEFVAR_LISP ("minibuffer-history-variable", &Vminibuffer_history_variable,
"History list symbol to add minibuffer values to.\n\
-Each minibuffer output is added with\n\
+Each string of minibuffer input, as it appears on exit from the minibuffer,\n\
+is added with\n\
(set minibuffer-history-variable\n\
(cons STRING (symbol-value minibuffer-history-variable)))");
- XFASTINT (Vminibuffer_history_variable) = 0;
+ XSETFASTINT (Vminibuffer_history_variable, 0);
DEFVAR_LISP ("minibuffer-history-position", &Vminibuffer_history_position,
"Current position of redoing in the history list.");