diff options
| author | Gerd Moellmann | 2000-10-19 12:03:08 +0000 |
|---|---|---|
| committer | Gerd Moellmann | 2000-10-19 12:03:08 +0000 |
| commit | 17401c97e685c7c966f62298451678fbd11e93c4 (patch) | |
| tree | fb5dfecbff092d57b7561d7f3c85297fed291854 /src | |
| parent | 877cf6b438c82e43ca401278f277ed344d05b0bf (diff) | |
| download | emacs-17401c97e685c7c966f62298451678fbd11e93c4.tar.gz emacs-17401c97e685c7c966f62298451678fbd11e93c4.zip | |
(skip_debugger): Prevent a compiler warning.
(Fcondition_case): Likewise.
(Fbacktrace_frame): Use a null interactive spec.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 6 | ||||
| -rw-r--r-- | src/eval.c | 13 |
2 files changed, 13 insertions, 6 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 4711516ba31..69651dc5ce9 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,9 @@ | |||
| 1 | 2000-10-19 Gerd Moellmann <gerd@gnu.org> | ||
| 2 | |||
| 3 | * eval.c (skip_debugger): Prevent a compiler warning. | ||
| 4 | (Fcondition_case): Likewise. | ||
| 5 | (Fbacktrace_frame): Use a null interactive spec. | ||
| 6 | |||
| 1 | 2000-10-19 Kenichi Handa <handa@etl.go.jp> | 7 | 2000-10-19 Kenichi Handa <handa@etl.go.jp> |
| 2 | 8 | ||
| 3 | * xterm.c (x_find_ccl_program): Check also fontp->full_name. | 9 | * xterm.c (x_find_ccl_program): Check also fontp->full_name. |
diff --git a/src/eval.c b/src/eval.c index 269eb4e95b7..f42ebc6979b 100644 --- a/src/eval.c +++ b/src/eval.c | |||
| @@ -1126,7 +1126,8 @@ See also the function `signal' for more info.") | |||
| 1126 | Lisp_Object val; | 1126 | Lisp_Object val; |
| 1127 | struct catchtag c; | 1127 | struct catchtag c; |
| 1128 | struct handler h; | 1128 | struct handler h; |
| 1129 | register Lisp_Object var, bodyform, handlers; | 1129 | register Lisp_Object bodyform, handlers; |
| 1130 | volatile Lisp_Object var; | ||
| 1130 | 1131 | ||
| 1131 | var = Fcar (args); | 1132 | var = Fcar (args); |
| 1132 | bodyform = Fcar (Fcdr (args)); | 1133 | bodyform = Fcar (Fcdr (args)); |
| @@ -1480,8 +1481,8 @@ skip_debugger (conditions, data) | |||
| 1480 | int first_string = 1; | 1481 | int first_string = 1; |
| 1481 | Lisp_Object error_message; | 1482 | Lisp_Object error_message; |
| 1482 | 1483 | ||
| 1483 | for (tail = Vdebug_ignored_errors; CONSP (tail); | 1484 | error_message = Qnil; |
| 1484 | tail = XCDR (tail)) | 1485 | for (tail = Vdebug_ignored_errors; CONSP (tail); tail = XCDR (tail)) |
| 1485 | { | 1486 | { |
| 1486 | if (STRINGP (XCAR (tail))) | 1487 | if (STRINGP (XCAR (tail))) |
| 1487 | { | 1488 | { |
| @@ -1490,6 +1491,7 @@ skip_debugger (conditions, data) | |||
| 1490 | error_message = Ferror_message_string (data); | 1491 | error_message = Ferror_message_string (data); |
| 1491 | first_string = 0; | 1492 | first_string = 0; |
| 1492 | } | 1493 | } |
| 1494 | |||
| 1493 | if (fast_string_match (XCAR (tail), error_message) >= 0) | 1495 | if (fast_string_match (XCAR (tail), error_message) >= 0) |
| 1494 | return 1; | 1496 | return 1; |
| 1495 | } | 1497 | } |
| @@ -1497,8 +1499,7 @@ skip_debugger (conditions, data) | |||
| 1497 | { | 1499 | { |
| 1498 | Lisp_Object contail; | 1500 | Lisp_Object contail; |
| 1499 | 1501 | ||
| 1500 | for (contail = conditions; CONSP (contail); | 1502 | for (contail = conditions; CONSP (contail); contail = XCDR (contail)) |
| 1501 | contail = XCDR (contail)) | ||
| 1502 | if (EQ (XCAR (tail), XCAR (contail))) | 1503 | if (EQ (XCAR (tail), XCAR (contail))) |
| 1503 | return 1; | 1504 | return 1; |
| 1504 | } | 1505 | } |
| @@ -3111,7 +3112,7 @@ Output stream used is value of `standard-output'.") | |||
| 3111 | return Qnil; | 3112 | return Qnil; |
| 3112 | } | 3113 | } |
| 3113 | 3114 | ||
| 3114 | DEFUN ("backtrace-frame", Fbacktrace_frame, Sbacktrace_frame, 1, 1, "", | 3115 | DEFUN ("backtrace-frame", Fbacktrace_frame, Sbacktrace_frame, 1, 1, NULL, |
| 3115 | "Return the function and arguments NFRAMES up from current execution point.\n\ | 3116 | "Return the function and arguments NFRAMES up from current execution point.\n\ |
| 3116 | If that frame has not evaluated the arguments yet (or is a special form),\n\ | 3117 | If that frame has not evaluated the arguments yet (or is a special form),\n\ |
| 3117 | the value is (nil FUNCTION ARG-FORMS...).\n\ | 3118 | the value is (nil FUNCTION ARG-FORMS...).\n\ |