diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2012-04-09 15:54:59 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2012-04-09 15:54:59 -0700 |
| commit | 45e9f7da84c1bd3fc0d36d05c5708ed3b2d3a193 (patch) | |
| tree | 5bc87a8b5a3c754b8eb44a612cc6c03561d6b968 /src/lisp.h | |
| parent | 9d6b4d53469a9ffd67bd770fabc6fe254e35c21d (diff) | |
| parent | 05920a43fc18e696b464387e781e7cfdcea5b5af (diff) | |
| download | emacs-45e9f7da84c1bd3fc0d36d05c5708ed3b2d3a193.tar.gz | |
Merge from trunk.
Diffstat (limited to 'src/lisp.h')
| -rw-r--r-- | src/lisp.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/lisp.h b/src/lisp.h index 47570ebee74..864346d85c2 100644 --- a/src/lisp.h +++ b/src/lisp.h @@ -1139,6 +1139,8 @@ struct Lisp_Symbol special (with `defvar' etc), and shouldn't be lexically bound. */ unsigned declared_special : 1; + unsigned spacer : 23; + /* The symbol's name, as a Lisp string. The name "xname" is used to intentionally break code referring to the old field "name" of type pointer to struct Lisp_String. */ @@ -2970,6 +2972,7 @@ extern Lisp_Object Qinhibit_quit, Qclosure; extern Lisp_Object Qand_rest; extern Lisp_Object Vautoload_queue; extern Lisp_Object Vsignaling_function; +extern Lisp_Object inhibit_lisp_code; extern int handling_signal; #if BYTE_MARK_STACK extern struct catchtag *catchlist; @@ -3580,6 +3583,7 @@ EXFUN (Fmsdos_downcase_filename, 1); #ifdef HAVE_LIBXML2 /* Defined in xml.c */ extern void syms_of_xml (void); +extern void xml_cleanup_parser (void); #endif #ifdef HAVE_MENUS |