5 files changed, 21 insertions, 5 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3966debad8b..aff58b8da21 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2011-01-20  Glenn Morris  <rgm@gnu.org>
+
+        * simple.el (read-expression-history): Remove, it's in minibuf.c.
+
 2011-01-20  Chong Yidong  <cyd@stupidchicken.com>
 
         * subr.el (y-or-n-p): Revert 2011-01-07 change, removing ARGS.
diff --git a/lisp/simple.el b/lisp/simple.el
index 78ba99a5bfd..476d5ab518d 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -1142,8 +1142,6 @@ in *Help* buffer.  See also the command `describe-char'."
   (set-keymap-parent m minibuffer-local-map)
   (setq read-expression-map m))
 
-(defvar read-expression-history nil)
-
 (defvar minibuffer-completing-symbol nil
   "Non-nil means completing a Lisp symbol in the minibuffer.")
 
diff --git a/src/ChangeLog b/src/ChangeLog
index 6e54c7a1809..8c6e8e8b99a 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,9 @@
 2011-01-20  Glenn Morris  <rgm@gnu.org>
 
+        * minibuf.c (syms_of_minibuf) <read-expression-history>:
+        Give it a doc string.
+        * globals.h: Add Vread_expression_history.
+
         * macros.c (syms_of_macros) <kbd-macro-termination-hook>:
         Give it a doc string.
         * globals.h: Add Vkbd_macro_termination_hook.
diff --git a/src/globals.h b/src/globals.h
index 2b051dd542c..3d7203b875a 100644
--- a/src/globals.h
+++ b/src/globals.h
@@ -983,6 +983,8 @@ struct emacs_globals
 
   Lisp_Object f_Vminibuffer_exit_hook;
 
+  Lisp_Object f_Vread_expression_history;
+
   /* Function to call to read a buffer name.  */
   Lisp_Object f_Vread_buffer_function;
 
@@ -2268,6 +2270,8 @@ extern struct emacs_globals globals;
     globals.f_Vquit_flag
 #define Vread_buffer_function \
     globals.f_Vread_buffer_function
+#define Vread_expression_history \
+    globals.f_Vread_expression_history
 #define Vread_circle \
     globals.f_Vread_circle
 #define Vread_expression_map \
diff --git a/src/minibuf.c b/src/minibuf.c
index 34854cfa420..9d3ff776e70 100644
--- a/src/minibuf.c
+++ b/src/minibuf.c
@@ -1,7 +1,8 @@
 /* Minibuffer input and completion.
-   Copyright (C) 1985, 1986, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-                 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
-                 2008, 2009, 2010, 2011  Free Software Foundation, Inc.
+
+Copyright (C) 1985, 1986, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
+   2011  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -2016,6 +2017,11 @@ syms_of_minibuf (void)
   Qcase_fold_search = intern_c_string ("case-fold-search");
   staticpro (&Qcase_fold_search);
 
+  DEFVAR_LISP ("read-expression-history", Vread_expression_history,
+               doc: /* A history list for arguments that are Lisp expressions to evaluate.
+For example, `eval-expression' uses this.  */);
+  Vread_expression_history = Qnil;
+
   Qread_expression_history = intern_c_string ("read-expression-history");
   staticpro (&Qread_expression_history);