Commit 9dc3366b authored by Glenn Morris's avatar Glenn Morris

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.
parent 466cbae9
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> 2011-01-07 Andreas Schwab <schwab@linux-m68k.org>
* image.c (imagemagick_load_image): Fix some resource leaks and * image.c (imagemagick_load_image): Fix some resource leaks and
......
...@@ -178,6 +178,8 @@ Lisp_Object Vsystem_configuration_options; ...@@ -178,6 +178,8 @@ Lisp_Object Vsystem_configuration_options;
Lisp_Object Qfile_name_handler_alist; Lisp_Object Qfile_name_handler_alist;
Lisp_Object Qrisky_local_variable;
/* Current and previous system locales for messages and time. */ /* Current and previous system locales for messages and time. */
Lisp_Object Vsystem_messages_locale; Lisp_Object Vsystem_messages_locale;
Lisp_Object Vprevious_system_messages_locale; Lisp_Object Vprevious_system_messages_locale;
...@@ -2407,6 +2409,8 @@ syms_of_emacs (void) ...@@ -2407,6 +2409,8 @@ syms_of_emacs (void)
{ {
Qfile_name_handler_alist = intern_c_string ("file-name-handler-alist"); Qfile_name_handler_alist = intern_c_string ("file-name-handler-alist");
staticpro (&Qfile_name_handler_alist); staticpro (&Qfile_name_handler_alist);
Qrisky_local_variable = intern_c_string ("risky-local-variable");
staticpro (&Qrisky_local_variable);
#ifndef CANNOT_DUMP #ifndef CANNOT_DUMP
defsubr (&Sdump_emacs); defsubr (&Sdump_emacs);
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
Copyright (C) 1985, 1986, 1987, 1988, 1993, 1994, 1995, 1997, 1998, Copyright (C) 1985, 1986, 1987, 1988, 1993, 1994, 1995, 1997, 1998,
1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 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. This file is part of GNU Emacs.
...@@ -336,8 +336,6 @@ Lisp_Object Qbar, Qhbar, Qbox, Qhollow; ...@@ -336,8 +336,6 @@ Lisp_Object Qbar, Qhbar, Qbox, Qhollow;
/* Pointer shapes */ /* Pointer shapes */
Lisp_Object Qarrow, Qhand, Qtext; Lisp_Object Qarrow, Qhand, Qtext;
Lisp_Object Qrisky_local_variable;
/* Holds the list (error). */ /* Holds the list (error). */
Lisp_Object list_of_error; Lisp_Object list_of_error;
...@@ -26581,8 +26579,6 @@ syms_of_xdisp (void) ...@@ -26581,8 +26579,6 @@ syms_of_xdisp (void)
staticpro (&Qarrow); staticpro (&Qarrow);
Qtext = intern_c_string ("text"); Qtext = intern_c_string ("text");
staticpro (&Qtext); 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"); Qinhibit_free_realized_faces = intern_c_string ("inhibit-free-realized-faces");
staticpro (&Qinhibit_free_realized_faces); staticpro (&Qinhibit_free_realized_faces);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment