aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorStefan Monnier2009-09-16 20:36:54 +0000
committerStefan Monnier2009-09-16 20:36:54 +0000
commitf9af9719571e216119aa40c6a4910f1f91d1dcac (patch)
tree18e491f83200e8d75d82a6bc467dea7abfb7bdbb /src
parentd2fd733eb40fcb20dbed9a1b8ad1798e622e8f0f (diff)
downloademacs-f9af9719571e216119aa40c6a4910f1f91d1dcac.tar.gz
emacs-f9af9719571e216119aa40c6a4910f1f91d1dcac.zip
(x_get_resource_string): Remove unused.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog4
-rw-r--r--src/frame.c25
2 files changed, 4 insertions, 25 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 22fc6507cc7..ec6d0095da5 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
12009-09-16 Stefan Monnier <monnier@iro.umontreal.ca>
2
3 * frame.c (x_get_resource_string): Remove unused.
4
12009-09-15 Jan Djärv <jan.h.d@swipnet.se> 52009-09-15 Jan Djärv <jan.h.d@swipnet.se>
2 6
3 * xterm.c (x_new_font): Call change_frame_size before calling 7 * xterm.c (x_new_font): Call change_frame_size before calling
diff --git a/src/frame.c b/src/frame.c
index dbcd67f0603..6726a7b918a 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -3893,31 +3893,6 @@ display_x_get_resource (dpyinfo, attribute, class, component, subclass)
3893 attribute, class, component, subclass); 3893 attribute, class, component, subclass);
3894} 3894}
3895 3895
3896/* Used when C code wants a resource value. */
3897
3898char *
3899x_get_resource_string (attribute, class)
3900 char *attribute, *class;
3901{
3902 char *name_key;
3903 char *class_key;
3904 struct frame *sf = SELECTED_FRAME ();
3905
3906 /* Allocate space for the components, the dots which separate them,
3907 and the final '\0'. */
3908 name_key = (char *) alloca (SBYTES (Vinvocation_name)
3909 + strlen (attribute) + 2);
3910 class_key = (char *) alloca ((sizeof (EMACS_CLASS) - 1)
3911 + strlen (class) + 2);
3912
3913 sprintf (name_key, "%s.%s", SDATA (Vinvocation_name), attribute);
3914 sprintf (class_key, "%s.%s", EMACS_CLASS, class);
3915
3916 return x_get_string_resource (FRAME_X_DISPLAY_INFO (sf)->xrdb,
3917 name_key, class_key);
3918}
3919
3920
3921/* Return the value of parameter PARAM. 3896/* Return the value of parameter PARAM.
3922 3897
3923 First search ALIST, then Vdefault_frame_alist, then the X defaults 3898 First search ALIST, then Vdefault_frame_alist, then the X defaults