From: Paul Eggert Date: Thu, 14 Apr 2011 03:05:57 +0000 (-0700) Subject: * xrdb.c (x_customization_string, x_rm_string): Now static. X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~299 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=ac64929e093edfc052160cdcbbf1a06596e26899;p=emacs.git * xrdb.c (x_customization_string, x_rm_string): Now static. --- diff --git a/src/ChangeLog b/src/ChangeLog index 269dcf02eb0..0d478b4cd07 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,7 @@ 2011-04-14 Paul Eggert + * xrdb.c (x_customization_string, x_rm_string): Now static. + * xmenu.c (x_menu_wait_for_event): Export only if USE_MOTIF. * xterm.h (x_menu_wait_for_event): Declare only if USE_MOTIF. diff --git a/src/xrdb.c b/src/xrdb.c index a79f453e5e1..d350f38a8c4 100644 --- a/src/xrdb.c +++ b/src/xrdb.c @@ -64,7 +64,7 @@ static int file_p (const char *filename); /* The string which gets substituted for the %C escape in XFILESEARCHPATH and friends, or zero if none was specified. */ -char *x_customization_string; +static char *x_customization_string; /* Return the value of the emacs.customization (Emacs.Customization) @@ -466,7 +466,7 @@ get_environ_db (void) /* Types of values that we can find in a database */ #define XrmStringType "String" /* String representation */ -XrmRepresentation x_rm_string; /* Quark representation */ +static XrmRepresentation x_rm_string; /* Quark representation */ /* Load X resources based on the display and a possible -xrm option. */