aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorStefan Monnier2007-08-29 21:45:22 +0000
committerStefan Monnier2007-08-29 21:45:22 +0000
commitfd0f53a90906db0dec3084f3085b7edd21c6c779 (patch)
tree09de0822113aa289d1e5821dcb95eba81ff4c5c1 /src
parentf0230324e9fb189b79f2307e47bdfd8c37a9a15f (diff)
downloademacs-fd0f53a90906db0dec3084f3085b7edd21c6c779.tar.gz
emacs-fd0f53a90906db0dec3084f3085b7edd21c6c779.zip
(check_x_display_info): Yet Another Int/Lisp_Object Mixup.
(x_icon): Comment-out var only used in commented-out code.
Diffstat (limited to 'src')
-rw-r--r--src/xfns.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/xfns.c b/src/xfns.c
index e49f8cb3112..14e5b058e32 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -280,7 +280,7 @@ check_x_display_info (object)
280 } 280 }
281 else if (INTEGERP (object)) 281 else if (INTEGERP (object))
282 { 282 {
283 struct terminal *t = get_terminal (XINT (object), 1); 283 struct terminal *t = get_terminal (object, 1);
284 284
285 if (t->type != output_x_window) 285 if (t->type != output_x_window)
286 error ("Terminal %d is not an X display", XINT (object)); 286 error ("Terminal %d is not an X display", XINT (object));
@@ -2874,7 +2874,9 @@ x_icon (f, parms)
2874 Lisp_Object parms; 2874 Lisp_Object parms;
2875{ 2875{
2876 Lisp_Object icon_x, icon_y; 2876 Lisp_Object icon_x, icon_y;
2877#if 0
2877 struct x_display_info *dpyinfo = FRAME_X_DISPLAY_INFO (f); 2878 struct x_display_info *dpyinfo = FRAME_X_DISPLAY_INFO (f);
2879#endif
2878 2880
2879 /* Set the position of the icon. Note that twm groups all 2881 /* Set the position of the icon. Note that twm groups all
2880 icons in an icon window. */ 2882 icons in an icon window. */