[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r102895: Declare some DEFVARs globall
From: |
Tom Tromey |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r102895: Declare some DEFVARs globally, not locally |
Date: |
Tue, 18 Jan 2011 10:28:28 -0700 |
User-agent: |
Bazaar (2.0.3) |
------------------------------------------------------------
revno: 102895
committer: Tom Tromey <address@hidden>
branch nick: trunk
timestamp: Tue 2011-01-18 10:28:28 -0700
message:
Declare some DEFVARs globally, not locally
* gtkutil.h (x_gtk_use_old_file_dialog, x_gtk_show_hidden_files)
(x_gtk_file_dialog_help_text, x_gtk_whole_detached_tool_bar):
Declare.
* gtkutil.c (xg_uses_old_file_dialog):
(xg_get_file_with_chooser):
(xg_tool_bar_detach_callback): Don't redeclare globals.
modified:
src/ChangeLog
src/gtkutil.c
src/gtkutil.h
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2011-01-18 17:00:04 +0000
+++ b/src/ChangeLog 2011-01-18 17:28:28 +0000
@@ -1,5 +1,14 @@
2011-01-18 Tom Tromey <address@hidden>
+ * gtkutil.h (x_gtk_use_old_file_dialog, x_gtk_show_hidden_files)
+ (x_gtk_file_dialog_help_text, x_gtk_whole_detached_tool_bar):
+ Declare.
+ * gtkutil.c (xg_uses_old_file_dialog):
+ (xg_get_file_with_chooser):
+ (xg_tool_bar_detach_callback): Don't redeclare globals.
+
+2011-01-18 Tom Tromey <address@hidden>
+
* lisp.h (DEFVAR_BUFFER_DEFAULTS): New macro.
* buffer.c (syms_of_buffer): Use DEFVAR_BUFFER_DEFAULTS.
=== modified file 'src/gtkutil.c'
--- a/src/gtkutil.c 2011-01-15 23:16:57 +0000
+++ b/src/gtkutil.c 2011-01-18 17:28:28 +0000
@@ -1536,7 +1536,6 @@
xg_uses_old_file_dialog (void)
{
#ifdef HAVE_GTK_FILE_SELECTION_NEW
- extern int x_gtk_use_old_file_dialog;
return x_gtk_use_old_file_dialog;
#else
return 0;
@@ -1577,8 +1576,6 @@
static void
xg_toggle_notify_cb (GObject *gobject, GParamSpec *arg1, gpointer user_data)
{
- extern int x_gtk_show_hidden_files;
-
if (strcmp (arg1->name, "show-hidden") == 0)
{
GtkWidget *wtoggle = GTK_WIDGET (user_data);
@@ -1626,9 +1623,6 @@
GtkFileChooserAction action = (mustmatch_p ?
GTK_FILE_CHOOSER_ACTION_OPEN :
GTK_FILE_CHOOSER_ACTION_SAVE);
- extern int x_gtk_show_hidden_files;
- extern int x_gtk_file_dialog_help_text;
-
if (only_dir_p)
action = GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER;
@@ -3794,7 +3788,6 @@
gpointer client_data)
{
FRAME_PTR f = (FRAME_PTR) client_data;
- extern int x_gtk_whole_detached_tool_bar;
g_object_set (G_OBJECT (w), "show-arrow", !x_gtk_whole_detached_tool_bar,
NULL);
=== modified file 'src/gtkutil.h'
--- a/src/gtkutil.h 2011-01-15 23:16:57 +0000
+++ b/src/gtkutil.h 2011-01-18 17:28:28 +0000
@@ -182,6 +182,11 @@
to indicate that the callback should do nothing. */
extern int xg_ignore_gtk_scrollbar;
+extern int x_gtk_use_old_file_dialog;
+extern int x_gtk_show_hidden_files;
+extern int x_gtk_file_dialog_help_text;
+extern int x_gtk_whole_detached_tool_bar;
+
#endif /* USE_GTK */
#endif /* GTKUTIL_H */
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r102895: Declare some DEFVARs globally, not locally,
Tom Tromey <=