diff options
| author | Richard M. Stallman <rms@gnu.org> | 1997-08-18 18:57:32 +0000 |
|---|---|---|
| committer | Richard M. Stallman <rms@gnu.org> | 1997-08-18 18:57:32 +0000 |
| commit | 495bb8912fd5403c8ce419806342247108f39247 (patch) | |
| tree | eaf0f262872187c6738d1a1924ec35ca47002c34 /src | |
| parent | 3d8e1fbd8b96314f78d61b3560e802a8c0af9e49 (diff) | |
| download | emacs-495bb8912fd5403c8ce419806342247108f39247.tar.gz | |
(read_minibuf): New arg disable_multibyte.
(Fcompleting_read): Pass 1 for disable_multibyte if
the completion table is read-file-name-internal.
Diffstat (limited to 'src')
| -rw-r--r-- | src/minibuf.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/minibuf.c b/src/minibuf.c index a9ff9b84e70..34a33adb8b0 100644 --- a/src/minibuf.c +++ b/src/minibuf.c @@ -197,7 +197,7 @@ static Lisp_Object read_minibuf (); static Lisp_Object read_minibuf (map, initial, prompt, backup_n, expflag, - histvar, histpos, defalt, allow_props) + histvar, histpos, defalt, allow_props, disable_multibyte) Lisp_Object map; Lisp_Object initial; Lisp_Object prompt; @@ -206,6 +206,7 @@ read_minibuf (map, initial, prompt, backup_n, expflag, Lisp_Object histvar; Lisp_Object histpos; Lisp_Object defalt; + int disable_multibyte; { Lisp_Object val; int count = specpdl_ptr - specpdl; @@ -642,7 +643,7 @@ DEFUN ("read-from-minibuffer", Fread_from_minibuffer, Sread_from_minibuffer, 1, val = read_minibuf (keymap, initial_contents, prompt, make_number (pos), !NILP (read), histvar, histpos, default_value, - minibuffer_allow_text_properties); + minibuffer_allow_text_properties, 0); if (STRINGP (val) && XSTRING (val)->size == 0 && ! NILP (default_value)) val = default_value; UNGCPRO; @@ -661,7 +662,7 @@ is a string to insert in the minibuffer before reading.") CHECK_STRING (initial_contents, 1); return read_minibuf (Vminibuffer_local_map, initial_contents, prompt, Qnil, 1, Qminibuffer_history, - make_number (0), Qnil, 0); + make_number (0), Qnil, 0, 0); } DEFUN ("eval-minibuffer", Feval_minibuffer, Seval_minibuffer, 1, 2, 0, @@ -700,7 +701,7 @@ Prompt with PROMPT, and provide INIT as an initial value of the input string.") CHECK_STRING (init, 1); return read_minibuf (Vminibuffer_local_ns_map, init, prompt, Qnil, - 0, Qminibuffer_history, make_number (0), Qnil, 0); + 0, Qminibuffer_history, make_number (0), Qnil, 0, 0); } DEFUN ("read-command", Fread_command, Sread_command, 1, 2, 0, @@ -1164,6 +1165,7 @@ DEFUN ("completing-read", Fcompleting_read, Scompleting_read, 2, 7, 0, int pos = 0; int count = specpdl_ptr - specpdl; struct gcpro gcpro1; + int disable_multibyte = EQ (table, Qread_file_name_internal); GCPRO1 (def); @@ -1209,7 +1211,7 @@ DEFUN ("completing-read", Fcompleting_read, Scompleting_read, 2, 7, 0, ? Vminibuffer_local_completion_map : Vminibuffer_local_must_match_map, init, prompt, make_number (pos), 0, - histvar, histpos, def, 0); + histvar, histpos, def, 0, disable_multibyte); if (STRINGP (val) && XSTRING (val)->size == 0 && ! NILP (def)) val = def; RETURN_UNGCPRO (unbind_to (count, val)); |