diff options
| author | Eli Zaretskii | 2010-03-28 09:04:11 -0400 |
|---|---|---|
| committer | Eli Zaretskii | 2010-03-28 09:04:11 -0400 |
| commit | e7dbdb6dfc3ffdc25f8d32a43683500f596d9784 (patch) | |
| tree | e7e73d34fe234175f7da59690ec5abf6f73b89a7 /src/dispextern.h | |
| parent | 34689d3c1ad54fd463d5f20c64bb1ac655dc5741 (diff) | |
| parent | 22ef1944028e9ac89a9717439b175ce3230a4ba1 (diff) | |
| download | emacs-e7dbdb6dfc3ffdc25f8d32a43683500f596d9784.tar.gz emacs-e7dbdb6dfc3ffdc25f8d32a43683500f596d9784.zip | |
Merge from mainline.
Diffstat (limited to 'src/dispextern.h')
| -rw-r--r-- | src/dispextern.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/dispextern.h b/src/dispextern.h index 3202385e541..03b35df397c 100644 --- a/src/dispextern.h +++ b/src/dispextern.h | |||
| @@ -3266,7 +3266,8 @@ enum resource_types | |||
| 3266 | RES_TYPE_FLOAT, | 3266 | RES_TYPE_FLOAT, |
| 3267 | RES_TYPE_BOOLEAN, | 3267 | RES_TYPE_BOOLEAN, |
| 3268 | RES_TYPE_STRING, | 3268 | RES_TYPE_STRING, |
| 3269 | RES_TYPE_SYMBOL | 3269 | RES_TYPE_SYMBOL, |
| 3270 | RES_TYPE_BOOLEAN_NUMBER | ||
| 3270 | }; | 3271 | }; |
| 3271 | 3272 | ||
| 3272 | extern Lisp_Object x_get_arg P_ ((Display_Info *, Lisp_Object, | 3273 | extern Lisp_Object x_get_arg P_ ((Display_Info *, Lisp_Object, |