Mercurial > emacs
changeset 112153:826bb901e88b
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.
| author | Glenn Morris <rgm@gnu.org> |
|---|---|
| date | Fri, 07 Jan 2011 18:31:57 -0800 |
| parents | f87a5809d0c2 |
| children | 3e52c52bbc1a |
| files | src/ChangeLog src/emacs.c src/xdisp.c |
| diffstat | 3 files changed, 10 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Fri Jan 07 23:33:32 2011 +0100 +++ b/src/ChangeLog Fri Jan 07 18:31:57 2011 -0800 @@ -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
--- a/src/emacs.c Fri Jan 07 23:33:32 2011 +0100 +++ b/src/emacs.c Fri Jan 07 18:31:57 2011 -0800 @@ -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);
--- a/src/xdisp.c Fri Jan 07 23:33:32 2011 +0100 +++ b/src/xdisp.c Fri Jan 07 18:31:57 2011 -0800 @@ -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);