comparison src/emacs.c @ 4408:8bbabcab2c42

Merge.
author Aidan Kehoe <kehoea@parhasard.net>
date Sun, 20 Jan 2008 13:09:58 +0100
parents 461fdb92f3b6
children eb82fbb675ea fd8a9a4d81d9
comparison
equal deleted inserted replaced
4407:4ee73bbe4f8e 4408:8bbabcab2c42
2160 vars_of_objects_tty (); 2160 vars_of_objects_tty ();
2161 #endif 2161 #endif
2162 2162
2163 #ifdef HAVE_GTK 2163 #ifdef HAVE_GTK
2164 vars_of_device_gtk (); 2164 vars_of_device_gtk ();
2165 vars_of_console_gtk ();
2165 #ifdef HAVE_DIALOGS 2166 #ifdef HAVE_DIALOGS
2166 vars_of_dialog_gtk (); 2167 vars_of_dialog_gtk ();
2167 #endif 2168 #endif
2168 vars_of_event_gtk (); 2169 vars_of_event_gtk ();
2169 vars_of_frame_gtk (); 2170 vars_of_frame_gtk ();