# HG changeset patch
# User Kenichi Handa <handa@etlken>
# Date 1281681336 -32400
# Node ID 1ae553f2722970e6a092a81ae1473d74f07cba23
# Parent  4a268c0f9823992543f1f1de320dcccc7f3e2599# Parent  0266442adf6acd1abd635cd629dd0dbad06617f9
merge emacs-23

diff -r 4a268c0f9823 -r 1ae553f27229 lisp/ChangeLog
--- a/lisp/ChangeLog	Fri Aug 13 15:26:27 2010 +0900
+++ b/lisp/ChangeLog	Fri Aug 13 15:35:36 2010 +0900
@@ -1,3 +1,7 @@
+2010-08-11  Andreas Schwab  <schwab@linux-m68k.org>
+
+	* subr.el (ignore-errors): Add debug declaration.
+
 2010-08-09  Geoff Gole  <geoffgole@gmail.com>  (tiny change)
 
 	* whitespace.el (whitespace-color-off): Remove post-command-hook
diff -r 4a268c0f9823 -r 1ae553f27229 lisp/subr.el
--- a/lisp/subr.el	Fri Aug 13 15:26:27 2010 +0900
+++ b/lisp/subr.el	Fri Aug 13 15:35:36 2010 +0900
@@ -219,6 +219,7 @@
 (defmacro ignore-errors (&rest body)
   "Execute BODY; if an error occurs, return nil.
 Otherwise, return result of last form in BODY."
+  (declare (debug t) (indent 0))
   `(condition-case nil (progn ,@body) (error nil)))
 
 ;;;; Basic Lisp functions.
diff -r 4a268c0f9823 -r 1ae553f27229 src/ChangeLog
--- a/src/ChangeLog	Fri Aug 13 15:26:27 2010 +0900
+++ b/src/ChangeLog	Fri Aug 13 15:35:36 2010 +0900
@@ -1,3 +1,9 @@
+2010-08-09  Peter O'Gorman <pogma@thewrittenword.com>  (tiny change)
+
+	* s/hpux10-20.h (HAVE_TERMIOS, NO_TERMIO, ORDINARY_LINK): New
+	definitions.
+	(HAVE_TERMIO): Remove.
+
 2010-08-06  Kenichi Handa  <handa@m17n.org>
 
 	* charset.c: Include <stdlib.h>
diff -r 4a268c0f9823 -r 1ae553f27229 src/s/hpux10-20.h
--- a/src/s/hpux10-20.h	Fri Aug 13 15:26:27 2010 +0900
+++ b/src/s/hpux10-20.h	Fri Aug 13 15:35:36 2010 +0900
@@ -41,12 +41,10 @@
 
 #define FIRST_PTY_LETTER 'p'
 
-/*
- *	Define HAVE_TERMIO if the system provides sysV-style ioctls
- *	for terminal control.
- */
+#define HAVE_TERMIOS
+#define NO_TERMIO
 
-#define HAVE_TERMIO
+#define ORDINARY_LINK
 
 /*
  *	Define HAVE_PTYS if the system supports pty devices.