[Emacs-diffs] /srv/bzr/emacs/trunk r102782: Fix bug#7750.

[Glenn Morris]

------------------------------------------------------------
revno: 102782
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Fri 2011-01-07 18:31:57 -0800
message:
  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.
modified:
  src/ChangeLog
  src/emacs.c
  src/xdisp.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2011-01-07 22:33:32 +0000
+++ b/src/ChangeLog     2011-01-08 02:31:57 +0000
@@ -1,3 +1,8 @@
+2011-01-08  Glenn Morris  <address@hidden>
+
+       * 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  <address@hidden>
 
        * image.c (imagemagick_load_image): Fix some resource leaks and

=== modified file 'src/emacs.c'
--- a/src/emacs.c       2011-01-07 03:10:39 +0000
+++ b/src/emacs.c       2011-01-08 02:31:57 +0000
@@ -178,6 +178,8 @@
 
 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 @@
 {
   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);

=== modified file 'src/xdisp.c'
--- a/src/xdisp.c       2011-01-02 20:28:40 +0000
+++ b/src/xdisp.c       2011-01-08 02:31:57 +0000
@@ -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 @@
 /* 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 @@
   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);