aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPaul Eggert2011-04-15 20:00:21 -0700
committerPaul Eggert2011-04-15 20:00:21 -0700
commit3565b3460d8304d295bf08e69252e61bf89dbb39 (patch)
tree89661ab74aa87b88500657c65f1a920b7809ffb9 /src
parentdc5ddd85313e7b86531ba66d1cffc46c6f64655e (diff)
downloademacs-3565b3460d8304d295bf08e69252e61bf89dbb39.tar.gz
emacs-3565b3460d8304d295bf08e69252e61bf89dbb39.zip
* xrdb.c (x_load_resources) [!USE_MOTIF]: Omit unused local.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog2
-rw-r--r--src/xrdb.c3
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 @@
12011-04-16 Paul Eggert <eggert@cs.ucla.edu> 12011-04-16 Paul Eggert <eggert@cs.ucla.edu>
2 2
3 * xrdb.c (x_load_resources) [!USE_MOTIF]: Omit unused local.
4
3 * xfns.c (free_frame_menubar, atof): Remove duplicate decls. 5 * xfns.c (free_frame_menubar, atof): Remove duplicate decls.
4 (x_window): Rename locals to avoid shadowing. 6 (x_window): Rename locals to avoid shadowing.
5 (USG): Use the kludged USG macro, to pacify gcc. 7 (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,
479 XrmDatabase db; 479 XrmDatabase db;
480 char line[256]; 480 char line[256];
481 481
482 const char *helv = "-*-helvetica-medium-r-*--*-120-*-*-*-*-iso8859-1";
483
484#ifdef USE_MOTIF 482#ifdef USE_MOTIF
483 const char *helv = "-*-helvetica-medium-r-*--*-120-*-*-*-*-iso8859-1";
485 const char *courier = "-*-courier-medium-r-*-*-*-120-*-*-*-*-iso8859-1"; 484 const char *courier = "-*-courier-medium-r-*-*-*-120-*-*-*-*-iso8859-1";
486#endif 485#endif
487 486