[Emacs-diffs] Changes to emacs/src/macfns.c

[YAMAMOTO Mitsuharu]

Index: emacs/src/macfns.c
diff -c emacs/src/macfns.c:1.53 emacs/src/macfns.c:1.54
*** emacs/src/macfns.c:1.53     Wed Mar 16 03:26:37 2005
--- emacs/src/macfns.c  Wed Mar 16 08:06:33 2005
***************
*** 2030,2078 ****
  
  /* Subroutines of creating a frame.  */
  
- static char *
- mac_get_rdb_resource (rdb, resource)
-      char *rdb;
-      char *resource;
- {
-   char *value = rdb;
-   int len = strlen (resource);
- 
-   while (*value)
-     {
-       if ((strncmp (value, resource, len) == 0) && (value[len] == ':'))
-         return xstrdup (&value[len + 1]);
- 
-       value = strchr (value, '\0') + 1;
-     }
- 
-   return NULL;
- }
- 
  /* Retrieve the string resource specified by NAME with CLASS from
!    database RDB. */
  
  char *
  x_get_string_resource (rdb, name, class)
       XrmDatabase rdb;
       char *name, *class;
  {
!   if (rdb)
!     {
!       char *resource;
! 
!       if (resource = mac_get_rdb_resource (rdb, name))
!         return resource;
!       if (resource = mac_get_rdb_resource (rdb, class))
!         return resource;
!     }
  
!   /* MAC_TODO: implement resource strings.  (Maybe Property Lists?)  */
! #if 0
!   return mac_get_string_resource (name, class);
! #else
!   return (char *)0;
! #endif
  }
  
  /* Return the value of parameter PARAM.
--- 2030,2053 ----
  
  /* Subroutines of creating a frame.  */
  
  /* Retrieve the string resource specified by NAME with CLASS from
!    database RDB.
! 
!    The return value points to the contents of a Lisp string.  So it
!    will not be valid after the next GC where string compaction will
!    occur.  */
  
  char *
  x_get_string_resource (rdb, name, class)
       XrmDatabase rdb;
       char *name, *class;
  {
!   Lisp_Object value = xrm_get_resource (rdb, name, class);
  
!   if (STRINGP (value))
!     return SDATA (value);
!   else
!     return NULL;
  }
  
  /* Return the value of parameter PARAM.