Merged from emacs@sv.gnu.org

Patches applied:

 * emacs@sv.gnu.org/emacs--devo--0--patch-144
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-145
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-146
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-147
   Merge from gnus--rel--5.10

 * emacs@sv.gnu.org/emacs--devo--0--patch-148
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-149
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-150
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-151
   Merge from gnus--rel--5.10

 * emacs@sv.gnu.org/emacs--devo--0--patch-152
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-56
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-57
   Copy/update icons from Gnus trunk

git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-530

1 files changed, 2 insertions, 0 deletions

diff --git a/src/w32term.c b/src/w32term.c
index 0017d2a5c86..bd04f0cb4b5 100644
--- a/src/w32term.c
+++ b/src/w32term.c
@@ -5236,6 +5236,8 @@ x_error_catcher (display, error)
 x_catch_errors (dpy)
 x_catch_errors_unwind (old_val)
 x_check_errors (dpy, format)
+x_fully_uncatch_errors ()
+x_catching_errors ()
 x_had_errors_p (dpy)
 x_clear_errors (dpy)
 x_uncatch_errors (dpy, count)