diff options
| author | Richard M. Stallman | 1995-08-06 06:09:59 +0000 |
|---|---|---|
| committer | Richard M. Stallman | 1995-08-06 06:09:59 +0000 |
| commit | cb9d21f8ac389471c6877ec0e14bc459177b5c35 (patch) | |
| tree | 278274846a46c543f8a64437ac3e98c9ba04b8c5 /src | |
| parent | 5ab52d421223602cddc37dd47b80b3929de930fd (diff) | |
| download | emacs-cb9d21f8ac389471c6877ec0e14bc459177b5c35.tar.gz emacs-cb9d21f8ac389471c6877ec0e14bc459177b5c35.zip | |
(run_hook_with_args): Move the GCPRO2; add UNGCPRO.
Diffstat (limited to 'src')
| -rw-r--r-- | src/eval.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/eval.c b/src/eval.c index 07fbf871b68..938b20cd824 100644 --- a/src/eval.c +++ b/src/eval.c | |||
| @@ -1927,8 +1927,6 @@ run_hook_with_args (nargs, args, cond) | |||
| 1927 | val = find_symbol_value (sym); | 1927 | val = find_symbol_value (sym); |
| 1928 | ret = (cond == until_failure ? Qt : Qnil); | 1928 | ret = (cond == until_failure ? Qt : Qnil); |
| 1929 | 1929 | ||
| 1930 | GCPRO2 (sym, val); | ||
| 1931 | |||
| 1932 | if (EQ (val, Qunbound) || NILP (val)) | 1930 | if (EQ (val, Qunbound) || NILP (val)) |
| 1933 | return ret; | 1931 | return ret; |
| 1934 | else if (!CONSP (val) || EQ (XCONS (val)->car, Qlambda)) | 1932 | else if (!CONSP (val) || EQ (XCONS (val)->car, Qlambda)) |
| @@ -1938,6 +1936,8 @@ run_hook_with_args (nargs, args, cond) | |||
| 1938 | } | 1936 | } |
| 1939 | else | 1937 | else |
| 1940 | { | 1938 | { |
| 1939 | GCPRO2 (sym, val); | ||
| 1940 | |||
| 1941 | for (; | 1941 | for (; |
| 1942 | CONSP (val) && ((cond == to_completion) | 1942 | CONSP (val) && ((cond == to_completion) |
| 1943 | || (cond == until_success ? NILP (ret) | 1943 | || (cond == until_success ? NILP (ret) |
| @@ -1966,6 +1966,8 @@ run_hook_with_args (nargs, args, cond) | |||
| 1966 | ret = Ffuncall (nargs, args); | 1966 | ret = Ffuncall (nargs, args); |
| 1967 | } | 1967 | } |
| 1968 | } | 1968 | } |
| 1969 | |||
| 1970 | UNGCPRO; | ||
| 1969 | return ret; | 1971 | return ret; |
| 1970 | } | 1972 | } |
| 1971 | } | 1973 | } |