From 6eeee4d618c29d8cb37a80e6c9c734ed32a788f2 Mon Sep 17 00:00:00 2001 From: YAMAMOTO Mitsuharu Date: Sun, 10 Sep 2006 05:52:54 +0000 Subject: (Fx_file_dialog): Call check_x. --- src/xfns.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src/xfns.c') diff --git a/src/xfns.c b/src/xfns.c index 8071ff1c4e6..dd8035c95af 100644 --- a/src/xfns.c +++ b/src/xfns.c @@ -5328,6 +5328,8 @@ or directory must exist. ONLY-DIR-P is ignored." */) int count = SPECPDL_INDEX (); struct gcpro gcpro1, gcpro2, gcpro3, gcpro4, gcpro5, gcpro6; + check_x (); + GCPRO6 (prompt, dir, default_filename, mustmatch, only_dir_p, file); if (popup_activated ()) @@ -5495,6 +5497,8 @@ directories. */) struct gcpro gcpro1, gcpro2, gcpro3, gcpro4, gcpro5, gcpro6; char *cdef_file; + check_x (); + GCPRO6 (prompt, dir, default_filename, mustmatch, only_dir_p, file); if (popup_activated ()) -- cgit v1.2.3 From 16e4bfaf96f1dd3b4d242e96f4b1a3c95bf065af Mon Sep 17 00:00:00 2001 From: Jan Djärv Date: Sun, 10 Sep 2006 12:16:58 +0000 Subject: * xfns.c (Fx_close_connection): Call xg_display_close when USE_GTK. --- src/xfns.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src/xfns.c') diff --git a/src/xfns.c b/src/xfns.c index dd8035c95af..2bb4310e437 100644 --- a/src/xfns.c +++ b/src/xfns.c @@ -4067,11 +4067,15 @@ If DISPLAY is nil, that stands for the selected frame's display. */) x_destroy_all_bitmaps (dpyinfo); XSetCloseDownMode (dpyinfo->display, DestroyAll); +#ifdef USE_GTK + xg_display_close (dpyinfo->display); +#else #ifdef USE_X_TOOLKIT XtCloseDisplay (dpyinfo->display); #else XCloseDisplay (dpyinfo->display); #endif +#endif /* ! USE_GTK */ x_delete_display (dpyinfo); UNBLOCK_INPUT; -- cgit v1.2.3 From 641c0105e5eff1110b0119ac3df674992f2a892e Mon Sep 17 00:00:00 2001 From: Jan Djärv Date: Sat, 16 Sep 2006 17:43:35 +0000 Subject: * xfns.c (syms_of_xfns): New variable: x-gtk-show-chooser-help-text. --- src/xfns.c | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'src/xfns.c') diff --git a/src/xfns.c b/src/xfns.c index 2bb4310e437..ea6d43f649f 100644 --- a/src/xfns.c +++ b/src/xfns.c @@ -158,6 +158,10 @@ int x_use_old_gtk_file_dialog; int x_gtk_show_hidden_files; +/* If non-zero, don't show additional help text in the GTK file chooser. */ + +int x_gtk_show_chooser_help_text; + /* If non-zero, don't collapse to tool bar when it is detached. */ int x_gtk_whole_detached_tool_bar; @@ -5814,6 +5818,12 @@ Note that this is just the default, there is a toggle button on the file chooser to show or not show hidden files on a case by case basis. */); x_gtk_show_hidden_files = 0; + DEFVAR_BOOL ("x-gtk-show-chooser-help-text", &x_gtk_show_chooser_help_text, + doc: /* *If non-nil, the GTK file chooser will by show additional help text. +If more space for files in the file chooser dialog is wanted, set this to nil +to turn the additional text off. */); + x_gtk_show_chooser_help_text = 1; + DEFVAR_BOOL ("x-gtk-whole-detached-tool-bar", &x_gtk_whole_detached_tool_bar, doc: /* *If non-nil, a detached tool bar is shown in full. The default is to just show an arrow and pressing on that arrow shows -- cgit v1.2.3 From fe2b14b7e8e09c7f4d9bbce8120e77bfd5b87d20 Mon Sep 17 00:00:00 2001 From: Jan Djärv Date: Mon, 18 Sep 2006 16:42:09 +0000 Subject: * xfns.c (syms_of_xfns): Rename x-use-old-gtk-file-dialog to x-gtk-use-old-file-dialog. --- src/xfns.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/xfns.c') diff --git a/src/xfns.c b/src/xfns.c index ea6d43f649f..c0806242d0b 100644 --- a/src/xfns.c +++ b/src/xfns.c @@ -152,7 +152,7 @@ int display_hourglass_p; /* Non-zero means prompt with the old GTK file selection dialog. */ -int x_use_old_gtk_file_dialog; +int x_gtk_use_old_file_dialog; /* If non-zero, by default show hidden files in the GTK file chooser. */ @@ -5805,12 +5805,12 @@ Chinese, Japanese, and Korean. */); Vx_pixel_size_width_font_regexp = Qnil; /* This is not ifdef:ed, so other builds than GTK can customize it. */ - DEFVAR_BOOL ("x-use-old-gtk-file-dialog", &x_use_old_gtk_file_dialog, + DEFVAR_BOOL ("x-gtk-use-old-file-dialog", &x_gtk_use_old_file_dialog, doc: /* *Non-nil means prompt with the old GTK file selection dialog. If nil or if the file selection dialog is not available, the new GTK file chooser is used instead. To turn off all file dialogs set the variable `use-file-dialog'. */); - x_use_old_gtk_file_dialog = 0; + x_gtk_use_old_file_dialog = 0; DEFVAR_BOOL ("x-gtk-show-hidden-files", &x_gtk_show_hidden_files, doc: /* *If non-nil, the GTK file chooser will by default show hidden files. -- cgit v1.2.3 From 159f8da7428e89714741d4e5789c250ad67a7487 Mon Sep 17 00:00:00 2001 From: Jan Djärv Date: Mon, 18 Sep 2006 16:48:05 +0000 Subject: * xfns.c (syms_of_xfns): Rename x_gtk_show_chooser_help_text to x_gtk_file_dialog_help_text. --- src/xfns.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/xfns.c') diff --git a/src/xfns.c b/src/xfns.c index c0806242d0b..7d19113db28 100644 --- a/src/xfns.c +++ b/src/xfns.c @@ -160,7 +160,7 @@ int x_gtk_show_hidden_files; /* If non-zero, don't show additional help text in the GTK file chooser. */ -int x_gtk_show_chooser_help_text; +int x_gtk_file_dialog_help_text; /* If non-zero, don't collapse to tool bar when it is detached. */ @@ -5818,11 +5818,11 @@ Note that this is just the default, there is a toggle button on the file chooser to show or not show hidden files on a case by case basis. */); x_gtk_show_hidden_files = 0; - DEFVAR_BOOL ("x-gtk-show-chooser-help-text", &x_gtk_show_chooser_help_text, + DEFVAR_BOOL ("x-gtk-file-dialog-help-text", &x_gtk_file_dialog_help_text, doc: /* *If non-nil, the GTK file chooser will by show additional help text. If more space for files in the file chooser dialog is wanted, set this to nil to turn the additional text off. */); - x_gtk_show_chooser_help_text = 1; + x_gtk_file_dialog_help_text = 1; DEFVAR_BOOL ("x-gtk-whole-detached-tool-bar", &x_gtk_whole_detached_tool_bar, doc: /* *If non-nil, a detached tool bar is shown in full. -- cgit v1.2.3 From 66687b7c0152a5790da2ab85b80e8e31c75c39eb Mon Sep 17 00:00:00 2001 From: Jan Djärv Date: Fri, 22 Sep 2006 08:09:10 +0000 Subject: * xfns.c (syms_of_xfns): Fix typo in help text for x-gtk-file-dialog-help-text. --- src/ChangeLog | 5 +++++ src/xfns.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) (limited to 'src/xfns.c') diff --git a/src/ChangeLog b/src/ChangeLog index 1618c072fe2..58be5bc2a41 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2006-09-22 Jan Dj,Ad(Brv + + * xfns.c (syms_of_xfns): Fix typo in help text for + x-gtk-file-dialog-help-text. + 2006-09-21 Kim F. Storm * fns.c (Fmemq): Refill doc string. diff --git a/src/xfns.c b/src/xfns.c index 7d19113db28..3afaf0ea20a 100644 --- a/src/xfns.c +++ b/src/xfns.c @@ -5819,7 +5819,7 @@ chooser to show or not show hidden files on a case by case basis. */); x_gtk_show_hidden_files = 0; DEFVAR_BOOL ("x-gtk-file-dialog-help-text", &x_gtk_file_dialog_help_text, - doc: /* *If non-nil, the GTK file chooser will by show additional help text. + doc: /* *If non-nil, the GTK file chooser will show additional help text. If more space for files in the file chooser dialog is wanted, set this to nil to turn the additional text off. */); x_gtk_file_dialog_help_text = 1; -- cgit v1.2.3