diff options
| author | Dan Nicolaescu | 2010-07-26 09:57:19 -0700 |
|---|---|---|
| committer | Dan Nicolaescu | 2010-07-26 09:57:19 -0700 |
| commit | f5ada8903b02e83a49a8846982039c040c3e2d2a (patch) | |
| tree | 0dc47c596f44d728b878ef31e2a72369a04a0f2d | |
| parent | e29eb8cf271ddb665685102447e9b7ae8b9c2273 (diff) | |
| download | emacs-f5ada8903b02e83a49a8846982039c040c3e2d2a.tar.gz emacs-f5ada8903b02e83a49a8846982039c040c3e2d2a.zip | |
* frame.h (Qtty_color_mode): Add declaration.
| -rw-r--r-- | src/ChangeLog | 2 | ||||
| -rw-r--r-- | src/frame.h | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 1780e4e5f11..6d812d2de93 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,5 +1,7 @@ | |||
| 1 | 2010-07-26 Dan Nicolaescu <dann@ics.uci.edu> | 1 | 2010-07-26 Dan Nicolaescu <dann@ics.uci.edu> |
| 2 | 2 | ||
| 3 | * frame.h (Qtty_color_mode): Add declaration. | ||
| 4 | |||
| 3 | * lisp.h (Ftop_level, Fexit_recursive_edit) | 5 | * lisp.h (Ftop_level, Fexit_recursive_edit) |
| 4 | (Fabort_recursive_edit): Mark as NO_RETURN. | 6 | (Fabort_recursive_edit): Mark as NO_RETURN. |
| 5 | 7 | ||
diff --git a/src/frame.h b/src/frame.h index 0abd878a31f..54b4c89d304 100644 --- a/src/frame.h +++ b/src/frame.h | |||
| @@ -1089,6 +1089,7 @@ extern Lisp_Object x_new_font (struct frame *, Lisp_Object, int); | |||
| 1089 | 1089 | ||
| 1090 | /* These are in frame.c */ | 1090 | /* These are in frame.c */ |
| 1091 | 1091 | ||
| 1092 | extern Lisp_Object Qtty_color_mode; | ||
| 1092 | extern Lisp_Object Vx_resource_name; | 1093 | extern Lisp_Object Vx_resource_name; |
| 1093 | extern Lisp_Object Vx_resource_class; | 1094 | extern Lisp_Object Vx_resource_class; |
| 1094 | 1095 | ||