From: Glenn Morris <rgm@gnu.org>
Date: Sat, 8 Jan 2011 02:31:57 +0000 (-0800)
Subject: Fix bug#7750.
X-Git-Tag: emacs-pretest-24.0.90~104^2~618^2~1322^2~270
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=9dc3366b13a1ff121aa5ab98d4ea67d38430fc6f;p=emacs.git

Fix bug#7750.
* src/xdisp.c (syms_of_xdisp) <Qrisky_local_variable>: Move from here...
* src/emacs.c (syms_of_emacs) <Qrisky_local_variable>: ...to here.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index d4283dffffd..d8c0bee3577 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2011-01-08  Glenn Morris  <rgm@gnu.org>
+
+	* xdisp.c (syms_of_xdisp) <Qrisky_local_variable>: Move from here...
+	* emacs.c (syms_of_emacs) <Qrisky_local_variable>: ...to here.
+
 2011-01-07  Andreas Schwab  <schwab@linux-m68k.org>
 
 	* image.c (imagemagick_load_image): Fix some resource leaks and
diff --git a/src/emacs.c b/src/emacs.c
index 2388146105b..6a04eda9aa2 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -178,6 +178,8 @@ Lisp_Object Vsystem_configuration_options;
 
 Lisp_Object Qfile_name_handler_alist;
 
+Lisp_Object Qrisky_local_variable;
+
 /* Current and previous system locales for messages and time.  */
 Lisp_Object Vsystem_messages_locale;
 Lisp_Object Vprevious_system_messages_locale;
@@ -2407,6 +2409,8 @@ syms_of_emacs (void)
 {
   Qfile_name_handler_alist = intern_c_string ("file-name-handler-alist");
   staticpro (&Qfile_name_handler_alist);
+  Qrisky_local_variable = intern_c_string ("risky-local-variable");
+  staticpro (&Qrisky_local_variable);
 
 #ifndef CANNOT_DUMP
   defsubr (&Sdump_emacs);
diff --git a/src/xdisp.c b/src/xdisp.c
index 4e15e8a5f6d..f7df35d059d 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -2,7 +2,7 @@
 
 Copyright (C) 1985, 1986, 1987, 1988, 1993, 1994, 1995, 1997, 1998,
   1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
-  2010  Free Software Foundation, Inc.
+  2010, 2011  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -336,8 +336,6 @@ Lisp_Object Qbar, Qhbar, Qbox, Qhollow;
 /* Pointer shapes */
 Lisp_Object Qarrow, Qhand, Qtext;
 
-Lisp_Object Qrisky_local_variable;
-
 /* Holds the list (error).  */
 Lisp_Object list_of_error;
 
@@ -26581,8 +26579,6 @@ syms_of_xdisp (void)
   staticpro (&Qarrow);
   Qtext = intern_c_string ("text");
   staticpro (&Qtext);
-  Qrisky_local_variable = intern_c_string ("risky-local-variable");
-  staticpro (&Qrisky_local_variable);
   Qinhibit_free_realized_faces = intern_c_string ("inhibit-free-realized-faces");
   staticpro (&Qinhibit_free_realized_faces);