diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2011-04-15 20:00:21 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2011-04-15 20:00:21 -0700 |
| commit | 3565b3460d8304d295bf08e69252e61bf89dbb39 (patch) | |
| tree | 89661ab74aa87b88500657c65f1a920b7809ffb9 | |
| parent | dc5ddd85313e7b86531ba66d1cffc46c6f64655e (diff) | |
| download | emacs-3565b3460d8304d295bf08e69252e61bf89dbb39.tar.gz | |
* xrdb.c (x_load_resources) [!USE_MOTIF]: Omit unused local.
| -rw-r--r-- | src/ChangeLog | 2 | ||||
| -rw-r--r-- | src/xrdb.c | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index c393527d39c..bb4cdf3663e 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,7 @@ 2011-04-16 Paul Eggert <eggert@cs.ucla.edu> + * xrdb.c (x_load_resources) [!USE_MOTIF]: Omit unused local. + * xfns.c (free_frame_menubar, atof): Remove duplicate decls. (x_window): Rename locals to avoid shadowing. (USG): Use the kludged USG macro, to pacify gcc. diff --git a/src/xrdb.c b/src/xrdb.c index d350f38a8c4..ebbcb2dc6d4 100644 --- a/src/xrdb.c +++ b/src/xrdb.c @@ -479,9 +479,8 @@ x_load_resources (Display *display, const char *xrm_string, XrmDatabase db; char line[256]; - const char *helv = "-*-helvetica-medium-r-*--*-120-*-*-*-*-iso8859-1"; - #ifdef USE_MOTIF + const char *helv = "-*-helvetica-medium-r-*--*-120-*-*-*-*-iso8859-1"; const char *courier = "-*-courier-medium-r-*-*-*-120-*-*-*-*-iso8859-1"; #endif |