diff options
| author | Paul Eggert | 2011-06-10 22:46:16 -0700 |
|---|---|---|
| committer | Paul Eggert | 2011-06-10 22:46:16 -0700 |
| commit | fc83f7d3d422039f041bbcc4f0cb75a1699421ad (patch) | |
| tree | ab145d16fb805bf749fcab7f7c70554242eab111 /src/data.c | |
| parent | e41e9a0e24877b0bc81e08df396f59115f8636da (diff) | |
| parent | cca693976c52acf26f5130848931d274522c69f9 (diff) | |
| download | emacs-fc83f7d3d422039f041bbcc4f0cb75a1699421ad.tar.gz emacs-fc83f7d3d422039f041bbcc4f0cb75a1699421ad.zip | |
Merge from trunk.
Diffstat (limited to 'src/data.c')
| -rw-r--r-- | src/data.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/data.c b/src/data.c index 85e6952efa5..57d7753e393 100644 --- a/src/data.c +++ b/src/data.c | |||
| @@ -89,8 +89,9 @@ Lisp_Object Qinteger; | |||
| 89 | static Lisp_Object Qsymbol, Qstring, Qcons, Qmarker, Qoverlay; | 89 | static Lisp_Object Qsymbol, Qstring, Qcons, Qmarker, Qoverlay; |
| 90 | Lisp_Object Qwindow; | 90 | Lisp_Object Qwindow; |
| 91 | static Lisp_Object Qfloat, Qwindow_configuration; | 91 | static Lisp_Object Qfloat, Qwindow_configuration; |
| 92 | static Lisp_Object Qprocess, Qcompiled_function; | 92 | static Lisp_Object Qprocess; |
| 93 | Lisp_Object Qbuffer, Qframe, Qvector; | 93 | static Lisp_Object Qcompiled_function, Qframe, Qvector; |
| 94 | Lisp_Object Qbuffer; | ||
| 94 | static Lisp_Object Qchar_table, Qbool_vector, Qhash_table; | 95 | static Lisp_Object Qchar_table, Qbool_vector, Qhash_table; |
| 95 | static Lisp_Object Qsubrp, Qmany, Qunevalled; | 96 | static Lisp_Object Qsubrp, Qmany, Qunevalled; |
| 96 | Lisp_Object Qfont_spec, Qfont_entity, Qfont_object; | 97 | Lisp_Object Qfont_spec, Qfont_entity, Qfont_object; |