[Emacs-diffs] /srv/bzr/emacs/trunk r103694: src/minibuf.c: Fix previous change.

[Juanma Barranquero]

------------------------------------------------------------
revno: 103694
committer: Juanma Barranquero <address@hidden>
branch nick: trunk
timestamp: Sun 2011-03-20 14:57:22 +0100
message:
  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.
modified:
  src/ChangeLog
  src/minibuf.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2011-03-20 10:35:27 +0000
+++ b/src/ChangeLog     2011-03-20 13:57:22 +0000
@@ -1,3 +1,9 @@
+2011-03-20  Juanma Barranquero  <address@hidden>
+
+       * 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  <address@hidden>
 
        * minibuf.c (completing-read-function): New variable.

=== modified file 'src/minibuf.c'
--- a/src/minibuf.c     2011-03-20 10:35:27 +0000
+++ b/src/minibuf.c     2011-03-20 13:57:22 +0000
@@ -73,7 +73,6 @@
 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 @@
   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;