X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/29adb7b55e89881d05165ddacd28144d1f878355..e2b6daf4193bcfd81d6dc67eeee3d50888710818:/src/xrdb.c

diff --git a/src/xrdb.c b/src/xrdb.c
index a1dc47c0b0..fac97e4350 100644
--- a/src/xrdb.c
+++ b/src/xrdb.c
@@ -1,13 +1,16 @@
 /* Deal with the X Resource Manager.
    Copyright (C) 1990, 1993, 1994, 2000, 2001, 2002, 2003, 2004,
-                 2005, 2006, 2007 Free Software Foundation, Inc.
+                 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+
+Author: Joseph Arceneaux
+Created: 4/90
 
 This file is part of GNU Emacs.
 
-GNU Emacs is free software; you can redistribute it and/or modify
+GNU Emacs is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 3, or (at your option)
-any later version.
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,11 +18,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-Boston, MA 02110-1301, USA.  */
-
-/* Written by jla, 4/90 */
+along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #ifdef emacs
 #include <config.h>
@@ -433,13 +432,11 @@ get_user_app (class)
     {
       XrmDatabase db = XrmGetFileDatabase (file);
       free (file);
-      if (free_it)
-	free (free_it);
+      free (free_it);
       return db;
     }
 
-  if (free_it)
-    free (free_it);
+  free (free_it);
   return NULL;
 }
 
@@ -506,8 +503,8 @@ get_environ_db ()
 
   db = XrmGetFileDatabase (p);
 
-  if (path) free (path);
-  if (home) free (home);
+  free (path);
+  free (home);
 
   return db;
 }
@@ -610,35 +607,11 @@ x_load_resources (display, xrm_string, myname, myclass)
 
 #endif /* not USE_MOTIF */
 
-#ifdef HAVE_X_I18N
-  {
-#ifdef USE_MOTIF
-    Bool motif = True;
-#else  /* not USE_MOTIF */
-    Bool motif = False;
-#endif  /* not USE_MOTIF */
-    /* Setup the default fontSet resource.  */
-    extern char *xic_create_fontsetname P_ ((char *base_fontname, Bool motif));
-    char *fontsetname = xic_create_fontsetname (helv, motif);
-    int len = strlen (fontsetname);
-    char *buf = line;
-
-    /* fontsetname may be very long.  */
-    if (len + 16 > 256)
-      buf = alloca (len + 16);
-    sprintf (buf, "Emacs*fontSet: %s", fontsetname);
-    XrmPutLineResource (&rdb, buf);
-    if (fontsetname != helv)
-      xfree (fontsetname);
-  }
-#endif	/* HAVE_X_I18N */
-
   user_database = get_user_db (display);
 
   /* Figure out what the "customization string" is, so we can use it
      to decode paths.  */
-  if (x_customization_string)
-    free (x_customization_string);
+  free (x_customization_string);
   x_customization_string
     = x_get_customization_string (user_database, myname, myclass);
 
@@ -720,6 +693,10 @@ x_get_string_resource (rdb, name, class)
 {
   XrmValue value;
 
+  if (inhibit_x_resources)
+    /* --quick was passed, so this is a no-op.  */
+    return NULL;
+
   if (x_get_resource (rdb, name, class, x_rm_string, &value))
     return (char *) value.addr;