aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJan Djärv2004-11-16 22:24:48 +0000
committerJan Djärv2004-11-16 22:24:48 +0000
commit724cde0d1d4e455b72a33689c56d86d3edf8faa6 (patch)
tree7682365aee7e5f7a02caa178b0ebe9729c85c59a /src
parent5ae53dcfca43ee0c8560f6e4fadfa9081adf68ae (diff)
downloademacs-724cde0d1d4e455b72a33689c56d86d3edf8faa6.tar.gz
emacs-724cde0d1d4e455b72a33689c56d86d3edf8faa6.zip
* gtkutil.c (xg_get_file_name): Fix typo in
HAVE_GTK_FILE_SELECTION_NEW.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog3
-rw-r--r--src/gtkutil.c4
2 files changed, 5 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 4fa76aeb5da..3061c19bd06 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
12004-11-16 Jan Dj,Ad(Brv <jan.h.d@swipnet.se> 12004-11-16 Jan Dj,Ad(Brv <jan.h.d@swipnet.se>
2 2
3 * gtkutil.c (xg_get_file_name): Fix typo in
4 HAVE_GTK_FILE_SELECTION_NEW.
5
3 * xmenu.c (x_menu_in_use): Removed. 6 * xmenu.c (x_menu_in_use): Removed.
4 (x_menu_set_in_use): Also set popup_activated_flag. 7 (x_menu_set_in_use): Also set popup_activated_flag.
5 8
diff --git a/src/gtkutil.c b/src/gtkutil.c
index 79333782229..25dd88d544e 100644
--- a/src/gtkutil.c
+++ b/src/gtkutil.c
@@ -1304,7 +1304,7 @@ xg_get_file_name (f, prompt, default_filename, mustmatch_p, only_dir_p)
1304 char *default_filename; 1304 char *default_filename;
1305 int mustmatch_p, only_dir_p; 1305 int mustmatch_p, only_dir_p;
1306{ 1306{
1307 GtkWidget *w; 1307 GtkWidget *w = 0;
1308 int count = SPECPDL_INDEX (); 1308 int count = SPECPDL_INDEX ();
1309 char *fn = 0; 1309 char *fn = 0;
1310 int filesel_done = 0; 1310 int filesel_done = 0;
@@ -1320,7 +1320,7 @@ xg_get_file_name (f, prompt, default_filename, mustmatch_p, only_dir_p)
1320 1320
1321#else /* not HAVE_GTK_FILE_BOTH */ 1321#else /* not HAVE_GTK_FILE_BOTH */
1322 1322
1323#ifdef HAVE_GTK_FILE_SELECTION_DIALOG_NEW 1323#ifdef HAVE_GTK_FILE_SELECTION_NEW
1324 w = xg_get_file_with_selection (f, prompt, default_filename, 1324 w = xg_get_file_with_selection (f, prompt, default_filename,
1325 mustmatch_p, only_dir_p, &func); 1325 mustmatch_p, only_dir_p, &func);
1326#endif 1326#endif