diff options
| author | Joakim Verona | 2015-01-15 14:54:25 +0100 |
|---|---|---|
| committer | Joakim Verona | 2015-01-15 14:54:25 +0100 |
| commit | 0298a2c6a10bc3b79cb2f45a1961dd7ac6da4e6d (patch) | |
| tree | 6c7ea25ac137f5764d931e841598a3c1ea434ab0 /src/eval.c | |
| parent | a1124bc117e41019de49c82d13d1a72a50df977d (diff) | |
| parent | 0e97c44c3699c4606a04f589828acdf9c03f447e (diff) | |
| download | emacs-0298a2c6a10bc3b79cb2f45a1961dd7ac6da4e6d.tar.gz emacs-0298a2c6a10bc3b79cb2f45a1961dd7ac6da4e6d.zip | |
merge master
Diffstat (limited to 'src/eval.c')
| -rw-r--r-- | src/eval.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/eval.c b/src/eval.c index 7e4b016b236..5cadb1bc2de 100644 --- a/src/eval.c +++ b/src/eval.c | |||
| @@ -1162,7 +1162,8 @@ unwind_to_catch (struct handler *catch, Lisp_Object value) | |||
| 1162 | 1162 | ||
| 1163 | DEFUN ("throw", Fthrow, Sthrow, 2, 2, 0, | 1163 | DEFUN ("throw", Fthrow, Sthrow, 2, 2, 0, |
| 1164 | doc: /* Throw to the catch for TAG and return VALUE from it. | 1164 | doc: /* Throw to the catch for TAG and return VALUE from it. |
| 1165 | Both TAG and VALUE are evalled. */) | 1165 | Both TAG and VALUE are evalled. */ |
| 1166 | attributes: noreturn) | ||
| 1166 | (register Lisp_Object tag, Lisp_Object value) | 1167 | (register Lisp_Object tag, Lisp_Object value) |
| 1167 | { | 1168 | { |
| 1168 | struct handler *c; | 1169 | struct handler *c; |