* minibuffer.el (minibuffer): Move group from cus-edit.el.

(completion-auto-help): Move from C code.
(minibuffer--maybe-completion-help): Remove.
(minibuffer--bitset): New function.
(minibuffer--do-completion): Rename from minibuffer-do-completion.
Renumber a bit.  Really complete on string *before* point.
Add argument used for word-completion.
Join trailing / in completion with following text, as done in
minibuffer-complete-word.
Handle new value `lazy' for completion-auto-help.
(minibuffer-try-word-completion): New function extracted from
minibuffer-complete-word.
(minibuffer-complete-word): Use minibuffer--do-completion.
(minibuffer--insert-strings): Rename from
minibuffer-complete-insert-strings.
(exit-minibuffer): Fix typo.
* cus-edit.el (minibuffer): Move group to minibuffer.el.
* cus-start.el: Remove completion-auto-help.
* minibuf.c (Vcompletion_auto_help): Move to minibuffer.el.
(syms_of_minibuf): Remove its initialization.

2 files changed, 3 insertions, 10 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 893af47ccc7..88a86246728 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
 2008-04-09  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+        * minibuf.c (Vcompletion_auto_help): Move to minibuffer.el.
+        (syms_of_minibuf): Remove its initialization.
+
         * minibuf.c (temp_echo_area_glyphs): Remove unused function.
 
 2008-04-09  Juanma Barranquero  <lekktu@gmail.com>
diff --git a/src/minibuf.c b/src/minibuf.c
index 8cdea645d34..dae6918e073 100644
--- a/src/minibuf.c
+++ b/src/minibuf.c
@@ -55,10 +55,6 @@ Lisp_Object minibuf_save_list;
 
 int minibuf_level;
 
-/* Nonzero means display completion help for invalid input.  */
-
-Lisp_Object Vcompletion_auto_help;
-
 /* The maximum length of a minibuffer history.  */
 
 Lisp_Object Qhistory_length, Vhistory_length;
@@ -2126,12 +2122,6 @@ history list, so it is possible to do this afterwards by calling
 `add-to-history' explicitly.  */);
   Vhistory_add_new_input = Qt;
 
-  DEFVAR_LISP ("completion-auto-help", &Vcompletion_auto_help,
-               doc: /* *Non-nil means automatically provide help for invalid completion input.
-Under Partial Completion mode, a non-nil, non-t value has a special meaning;
-see the doc string of `partial-completion-mode' for more details.  */);
-  Vcompletion_auto_help = Qt;
-
   DEFVAR_BOOL ("completion-ignore-case", &completion_ignore_case,
                doc: /* Non-nil means don't consider case significant in completion.