Merge from emacs--rel--22

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

diff --git a/src/ChangeLog b/src/ChangeLog
index 089afb97ecc6a1db211b418eabaf0c8c8078afda..9c5c073fc79c3455ddea5ca230eab2c7288a9311 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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 --git a/src/macterm.c b/src/macterm.c
index 2e9e6a3c2a1a07fc41947f1674e431594f016a58..0542b043f8e54a4db0f4426dac360012e96790f7 100644 (file)
--- a/src/macterm.c
+++ b/src/macterm.c
@@ -3550,7 +3550,6 @@ x_draw_relief_rect (f, left_x, top_y, right_x, bottom_y, width,
      int top_p, bot_p, left_p, right_p, raised_p;
      Rect *clip_rect;
 {
-  Display *dpy = FRAME_MAC_DISPLAY (f);
   int i;
   GC gc;