# HG changeset patch
# User Miles Bader <miles@gnu.org>
# Date 1210903557 0
# Node ID 85094617d51a63e9729b24b4edb8c66a912e7d00
# Parent  2f9176381b29f44eee9ca78c2b27beba9667d290# Parent  b301b9e46cd06993a4926fb01a88e1841de3c11a
Merge from emacs--rel--22

Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1166

diff -r 2f9176381b29 -r 85094617d51a src/ChangeLog
--- a/src/ChangeLog	Fri May 16 02:05:17 2008 +0000
+++ b/src/ChangeLog	Fri May 16 02:05:57 2008 +0000
@@ -1,3 +1,7 @@
+2008-05-15  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+	* macterm.c (x_draw_relief_rect): Remove unused variable `dpy'.
+
 2008-05-15  Kenichi Handa  <handa@m17n.org>
 
 	* font.c (font_find_for_lface): Reflect LFACE_FONT in the font
diff -r 2f9176381b29 -r 85094617d51a src/macterm.c
--- a/src/macterm.c	Fri May 16 02:05:17 2008 +0000
+++ b/src/macterm.c	Fri May 16 02:05:57 2008 +0000
@@ -3550,7 +3550,6 @@
      int top_p, bot_p, left_p, right_p, raised_p;
      Rect *clip_rect;
 {
-  Display *dpy = FRAME_MAC_DISPLAY (f);
   int i;
   GC gc;