From: Paul Eggert Date: Sat, 16 Apr 2011 03:00:21 +0000 (-0700) Subject: * xrdb.c (x_load_resources) [!USE_MOTIF]: Omit unused local. X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~268^2~46 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=3565b3460d8304d295bf08e69252e61bf89dbb39;p=emacs.git * xrdb.c (x_load_resources) [!USE_MOTIF]: Omit unused local. --- 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 + * 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