diff options
| author | Paul Eggert | 2011-04-15 00:48:51 -0700 |
|---|---|---|
| committer | Paul Eggert | 2011-04-15 00:48:51 -0700 |
| commit | 4170f62f39edf1ff1e99aec9bfbfe7bbf10e7fc9 (patch) | |
| tree | e993b231bb5555c9c961f5d0b20d90ac76f77bbd /src/xrdb.c | |
| parent | 1963a2e0bb07cc8dee6d27f972f93d9cfd7c6b2d (diff) | |
| parent | 49093f601b69d91126aefd328ee8f6bfeb797407 (diff) | |
| download | emacs-4170f62f39edf1ff1e99aec9bfbfe7bbf10e7fc9.tar.gz emacs-4170f62f39edf1ff1e99aec9bfbfe7bbf10e7fc9.zip | |
Merge from mainline.
Diffstat (limited to 'src/xrdb.c')
| -rw-r--r-- | src/xrdb.c | 4 |
1 files changed, 2 insertions, 2 deletions
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 | ||