diff options
| author | Stefan Monnier | 2013-09-10 11:30:10 -0400 |
|---|---|---|
| committer | Stefan Monnier | 2013-09-10 11:30:10 -0400 |
| commit | 8c27f5ff1df300aa313b1385442bc2374979f862 (patch) | |
| tree | 754505334854d6a6dcf18e62e69edf7da71f9775 /src | |
| parent | c2a918ae6ed054c4c09483619f1599605cc140b4 (diff) | |
| download | emacs-8c27f5ff1df300aa313b1385442bc2374979f862.tar.gz emacs-8c27f5ff1df300aa313b1385442bc2374979f862.zip | |
* lisp/subr.el (with-demoted-errors): Add `format' argument.
* src/eval.c (Feval): Document the new use of `lexical'.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 8 | ||||
| -rw-r--r-- | src/eval.c | 4 |
2 files changed, 9 insertions, 3 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 4b688e43430..4e08178989e 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2013-09-10 Stefan Monnier <monnier@iro.umontreal.ca> | ||
| 2 | |||
| 3 | * eval.c (Feval): Document the new use of `lexical'. | ||
| 4 | |||
| 1 | 2013-09-09 Dmitry Antipov <dmantipov@yandex.ru> | 5 | 2013-09-09 Dmitry Antipov <dmantipov@yandex.ru> |
| 2 | 6 | ||
| 3 | Review and drop old frame resize hack. | 7 | Review and drop old frame resize hack. |
| @@ -20,8 +24,8 @@ | |||
| 20 | 2013-09-09 Dmitry Antipov <dmantipov@yandex.ru> | 24 | 2013-09-09 Dmitry Antipov <dmantipov@yandex.ru> |
| 21 | 25 | ||
| 22 | Cleanup frame flushing. | 26 | Cleanup frame flushing. |
| 23 | * dispextern.h (struct redisplay_interface): Drop | 27 | * dispextern.h (struct redisplay_interface): |
| 24 | flush_display_optional because flush_display is enough | 28 | Drop flush_display_optional because flush_display is enough |
| 25 | for X and flushing via RIF is just a no-op for others. | 29 | for X and flushing via RIF is just a no-op for others. |
| 26 | * frame.h (flush_frame): New function. | 30 | * frame.h (flush_frame): New function. |
| 27 | * dispnew.c (update_frame): | 31 | * dispnew.c (update_frame): |
diff --git a/src/eval.c b/src/eval.c index 9db4d1fd81b..6e964f6604b 100644 --- a/src/eval.c +++ b/src/eval.c | |||
| @@ -2033,7 +2033,9 @@ it is defines a macro. */) | |||
| 2033 | 2033 | ||
| 2034 | DEFUN ("eval", Feval, Seval, 1, 2, 0, | 2034 | DEFUN ("eval", Feval, Seval, 1, 2, 0, |
| 2035 | doc: /* Evaluate FORM and return its value. | 2035 | doc: /* Evaluate FORM and return its value. |
| 2036 | If LEXICAL is t, evaluate using lexical scoping. */) | 2036 | If LEXICAL is t, evaluate using lexical scoping. |
| 2037 | LEXICAL can also be an actual lexical environment, in the form of an | ||
| 2038 | alist mapping symbols to their value. */) | ||
| 2037 | (Lisp_Object form, Lisp_Object lexical) | 2039 | (Lisp_Object form, Lisp_Object lexical) |
| 2038 | { | 2040 | { |
| 2039 | ptrdiff_t count = SPECPDL_INDEX (); | 2041 | ptrdiff_t count = SPECPDL_INDEX (); |