src/minibuf.c: Fix previous change.

* minibuf.c (Vcompleting_read_function): Don't declare, global variables
  are now in src/globals.h.
  (syms_of_minibuf): Remove spurious & from previous change.

diff --git a/src/ChangeLog b/src/ChangeLog
index d5d1efebef8984de485ffac720de7e61e9d31a6f..95bafd023b4ae3a26d67d4d9b45acd324fc0da95 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2011-03-20  Juanma Barranquero  <lekktu@gmail.com>
+
+       * minibuf.c (Vcompleting_read_function): Don't declare, global variables
+       are now in src/globals.h.
+       (syms_of_minibuf): Remove spurious & from previous change.
+
 2011-03-20  Leo  <sdl.web@gmail.com>
 
        * minibuf.c (completing-read-function): New variable.

diff --git a/src/minibuf.c b/src/minibuf.c
index 3fbe14e9da0d71ecd0ecc0a471a899069875c252..b6b79be9d3fb838e30fa8f0a015b59adcaab4b9d 100644 (file)
--- a/src/minibuf.c
+++ b/src/minibuf.c
@@ -73,7 +73,6 @@ Lisp_Object Qminibuffer_completion_table;
 Lisp_Object Qminibuffer_completion_predicate;
 Lisp_Object Qminibuffer_completion_confirm;
 Lisp_Object Qcompleting_read_default;
-Lisp_Object Vcompleting_read_function;
 Lisp_Object Quser_variable_p;
 
 Lisp_Object Qminibuffer_default;
@@ -2142,7 +2141,7 @@ If the value is `confirm-after-completion', the user may exit with an
   Vminibuffer_completing_file_name = Qnil;
 
   DEFVAR_LISP ("completing-read-function",
-              &Vcompleting_read_function,
+              Vcompleting_read_function,
               doc: /* The function called by `completing-read' to do the work.
 It should accept the same arguments as `completing-read'.  */);
   Vcompleting_read_function = Qcompleting_read_default;