diff options
| author | Paul Eggert | 2011-04-13 20:05:57 -0700 |
|---|---|---|
| committer | Paul Eggert | 2011-04-13 20:05:57 -0700 |
| commit | ac64929e093edfc052160cdcbbf1a06596e26899 (patch) | |
| tree | 99b6b73cf2724310af7f2908bd3a347d4ff4348a /src | |
| parent | 6f37259d326459347925b92219d1c573c6ab6dd0 (diff) | |
| download | emacs-ac64929e093edfc052160cdcbbf1a06596e26899.tar.gz emacs-ac64929e093edfc052160cdcbbf1a06596e26899.zip | |
* xrdb.c (x_customization_string, x_rm_string): Now static.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 2 | ||||
| -rw-r--r-- | src/xrdb.c | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 269dcf02eb0..0d478b4cd07 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,5 +1,7 @@ | |||
| 1 | 2011-04-14 Paul Eggert <eggert@cs.ucla.edu> | 1 | 2011-04-14 Paul Eggert <eggert@cs.ucla.edu> |
| 2 | 2 | ||
| 3 | * xrdb.c (x_customization_string, x_rm_string): Now static. | ||
| 4 | |||
| 3 | * xmenu.c (x_menu_wait_for_event): Export only if USE_MOTIF. | 5 | * xmenu.c (x_menu_wait_for_event): Export only if USE_MOTIF. |
| 4 | * xterm.h (x_menu_wait_for_event): Declare only if USE_MOTIF. | 6 | * xterm.h (x_menu_wait_for_event): Declare only if USE_MOTIF. |
| 5 | 7 | ||
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); | |||
| 64 | 64 | ||
| 65 | /* The string which gets substituted for the %C escape in XFILESEARCHPATH | 65 | /* The string which gets substituted for the %C escape in XFILESEARCHPATH |
| 66 | and friends, or zero if none was specified. */ | 66 | and friends, or zero if none was specified. */ |
| 67 | char *x_customization_string; | 67 | static char *x_customization_string; |
| 68 | 68 | ||
| 69 | 69 | ||
| 70 | /* Return the value of the emacs.customization (Emacs.Customization) | 70 | /* Return the value of the emacs.customization (Emacs.Customization) |
| @@ -466,7 +466,7 @@ get_environ_db (void) | |||
| 466 | /* Types of values that we can find in a database */ | 466 | /* Types of values that we can find in a database */ |
| 467 | 467 | ||
| 468 | #define XrmStringType "String" /* String representation */ | 468 | #define XrmStringType "String" /* String representation */ |
| 469 | XrmRepresentation x_rm_string; /* Quark representation */ | 469 | static XrmRepresentation x_rm_string; /* Quark representation */ |
| 470 | 470 | ||
| 471 | /* Load X resources based on the display and a possible -xrm option. */ | 471 | /* Load X resources based on the display and a possible -xrm option. */ |
| 472 | 472 | ||