summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/ChangeLog5
-rw-r--r--src/dispnew.c2
2 files changed, 7 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 8bc7d6d24a4..ff9664d208f 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2012-06-08 Juanma Barranquero <lekktu@gmail.com>
+
+ * dispnew.c (showing_window_margins_p): Wrap in #if 0 to prevent unused
+ function warning (the only call is inside #if 0 since 2012-06-08T08:44:45Z!eliz@gnu.org).
+
2012-06-08 Eli Zaretskii <eliz@gnu.org>
* alloc.c (allocate_vectorlike): Fix last change.
diff --git a/src/dispnew.c b/src/dispnew.c
index 5cf6d581790..fa9154bb6cc 100644
--- a/src/dispnew.c
+++ b/src/dispnew.c
@@ -1962,6 +1962,7 @@ adjust_frame_glyphs (struct frame *f)
/* Return 1 if any window in the tree has nonzero window margins. See
the hack at the end of adjust_frame_glyphs_for_frame_redisplay. */
+#if 0
static int
showing_window_margins_p (struct window *w)
{
@@ -1985,6 +1986,7 @@ showing_window_margins_p (struct window *w)
}
return 0;
}
+#endif
/* In the window tree with root W, build current matrices of leaf