diff options
| author | Richard M. Stallman <[email protected]> | 1994-09-22 07:41:35 +0000 |
|---|---|---|
| committer | Richard M. Stallman <[email protected]> | 1994-09-22 07:41:35 +0000 |
| commit | 6b3faad82b11e79694f2f1675c68c9d2ce111919 (patch) | |
| tree | 6cb2a86765168ee649619b2e1af6dd79081b1e7c | |
| parent | 4efe9929080c33afe292389d6d17a0d1f9ef0c60 (diff) | |
(Fcompleting_read): Doc fix.
(get_minibuffer): Make BUF current to kill its local vars.
| -rw-r--r-- | src/minibuf.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/minibuf.c b/src/minibuf.c index 1a359e91f5..3654c01d84 100644 --- a/src/minibuf.c +++ b/src/minibuf.c @@ -339,8 +339,13 @@ get_minibuffer (depth) } else { + int count = specpdl_ptr - specpdl; + reset_buffer (XBUFFER (buf)); - Fkill_all_local_variables (buf); + record_unwind_protect (Fset_buffer, Fcurrent_buffer ()); + Fset_buffer (buf); + Fkill_all_local_variables (); + unbind_to (count, Qnil); } return buf; @@ -925,7 +930,8 @@ Args: PROMPT, TABLE, PREDICATE, REQUIRE-MATCH, INITIAL-INPUT, HIST.\n\ 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 or is null.\n\ |