Mercurial > emacs
changeset 109918:1ae553f27229
merge emacs-23
| author | Kenichi Handa <handa@etlken> |
|---|---|
| date | Fri, 13 Aug 2010 15:35:36 +0900 |
| parents | 4a268c0f9823 (current diff) 0266442adf6a (diff) |
| children | f0dab256c4f7 fa7a6dee64ce |
| files | |
| diffstat | 4 files changed, 14 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- 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
--- 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.
--- 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>
--- 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.