aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJan Djärv2005-03-18 21:20:55 +0000
committerJan Djärv2005-03-18 21:20:55 +0000
commit9188be47894513f5bb58b58ed619d9f5de14ec38 (patch)
tree8a9ca53f6d1b4be16f7daf50d9a6586b615bfa11 /src
parenta01a20dbff6e72b19c778fc6a8c0bb54e32fe0b1 (diff)
downloademacs-9188be47894513f5bb58b58ed619d9f5de14ec38.tar.gz
emacs-9188be47894513f5bb58b58ed619d9f5de14ec38.zip
h* xfns.c (x_create_tip_frame): Removed setting of Vx_resource_name so
that it doesn't become "tooltip". The specbind is enough.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog4
-rw-r--r--src/xfns.c4
2 files changed, 2 insertions, 6 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 2727a6dfafd..92be15873c0 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,7 +1,7 @@
12005-03-18 Jan Dj,Ad(Brv <jan.h.d@swipnet.se> 12005-03-18 Jan Dj,Ad(Brv <jan.h.d@swipnet.se>
2 2
3 * xfns.c (Fx_create_frame): Removed setting of Vx_resource_name so 3 * xfns.c (x_create_tip_frame): Removed setting of Vx_resource_name so
4 that it doesn't become "tooltip". The specbind is enough. 4 that it doesn't become "tooltip". The specbind is enough.
5 5
6 * xrdb.c (x_load_resources): Use different char *helv when I18N 6 * xrdb.c (x_load_resources): Use different char *helv when I18N
7 is present. 7 is present.
diff --git a/src/xfns.c b/src/xfns.c
index 603a948a372..34e474c7f0c 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -4602,9 +4602,6 @@ x_create_tip_frame (dpyinfo, parms, text)
4602 4602
4603 check_x (); 4603 check_x ();
4604 4604
4605 /* Use this general default value to start with until we know if
4606 this frame has a specified name. */
4607 Vx_resource_name = Vinvocation_name;
4608 4605
4609#ifdef MULTI_KBOARD 4606#ifdef MULTI_KBOARD
4610 kb = dpyinfo->kboard; 4607 kb = dpyinfo->kboard;
@@ -4618,7 +4615,6 @@ x_create_tip_frame (dpyinfo, parms, text)
4618 && !EQ (name, Qunbound) 4615 && !EQ (name, Qunbound)
4619 && !NILP (name)) 4616 && !NILP (name))
4620 error ("Invalid frame name--not a string or nil"); 4617 error ("Invalid frame name--not a string or nil");
4621 Vx_resource_name = name;
4622 4618
4623 frame = Qnil; 4619 frame = Qnil;
4624 GCPRO3 (parms, name, frame); 4620 GCPRO3 (parms, name, frame);