diff options
| author | Paul Eggert | 2011-01-17 11:01:01 -0800 |
|---|---|---|
| committer | Paul Eggert | 2011-01-17 11:01:01 -0800 |
| commit | a3e44e793796153ff1534be9c74fcab50b45de30 (patch) | |
| tree | 863d5db087c8e034c96d06ea955515f4d3f3d0a3 /src/eval.c | |
| parent | 7f818df9420a1320539f7e3e633003573a570413 (diff) | |
| parent | 721be9cd4865e9f7d68020adcfa672d2edd52b07 (diff) | |
| download | emacs-a3e44e793796153ff1534be9c74fcab50b45de30.tar.gz emacs-a3e44e793796153ff1534be9c74fcab50b45de30.zip | |
Merge from mainline.
Diffstat (limited to 'src/eval.c')
| -rw-r--r-- | src/eval.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/eval.c b/src/eval.c index cd06b147c28..709a54fc2ec 100644 --- a/src/eval.c +++ b/src/eval.c | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | /* Evaluator for GNU Emacs Lisp interpreter. | 1 | /* Evaluator for GNU Emacs Lisp interpreter. |
| 2 | Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1999, 2000, 2001, | 2 | Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1999, 2000, 2001, |
| 3 | 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 | 3 | 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, |
| 4 | Free Software Foundation, Inc. | 4 | 2011 Free Software Foundation, Inc. |
| 5 | 5 | ||
| 6 | This file is part of GNU Emacs. | 6 | This file is part of GNU Emacs. |
| 7 | 7 | ||
| @@ -3699,5 +3699,3 @@ The value the function returns is not used. */); | |||
| 3699 | defsubr (&Sbacktrace_frame); | 3699 | defsubr (&Sbacktrace_frame); |
| 3700 | } | 3700 | } |
| 3701 | 3701 | ||
| 3702 | /* arch-tag: 014a07aa-33ab-4a8f-a3d2-ee8a4a9ff7fb | ||
| 3703 | (do not change this comment) */ | ||