From: Paul Eggert <eggert@cs.ucla.edu>
Date: Wed, 6 Apr 2011 22:46:00 +0000 (-0700)
Subject: * xterm.c (x_catch_errors): Remove duplicate declaration.
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~356^2~27
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=ce4d90b550a2bfb66099784386910a81b31421ed;p=emacs.git

* xterm.c (x_catch_errors): Remove duplicate declaration.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 8c92869db1f..ce97ca8204b 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,7 @@
 2011-04-06  Paul Eggert  <eggert@cs.ucla.edu>
 
+	* xterm.c (x_catch_errors): Remove duplicate declaration.
+
 	* term.c (maybe_fatal): Mark its 3rd arg as a printf format, too.
 
 	* xdisp.c, lisp.h (message_nolog): Remove; unused.
diff --git a/src/xterm.c b/src/xterm.c
index 92df7ae8746..3fc431c1350 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -7540,8 +7540,6 @@ x_error_catcher (Display *display, XErrorEvent *event)
 
    Calling x_uncatch_errors resumes the normal error handling.  */
 
-void x_check_errors (Display *dpy, const char *format);
-
 void
 x_catch_errors (Display *dpy)
 {