diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2013-09-10 11:30:10 -0400 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2013-09-10 11:30:10 -0400 |
| commit | 8c27f5ff1df300aa313b1385442bc2374979f862 (patch) | |
| tree | 754505334854d6a6dcf18e62e69edf7da71f9775 /src | |
| parent | c2a918ae6ed054c4c09483619f1599605cc140b4 (diff) | |
| download | emacs-8c27f5ff1df300aa313b1385442bc2374979f862.tar.gz | |
* 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 @@ +2013-09-10 Stefan Monnier <monnier@iro.umontreal.ca> + + * eval.c (Feval): Document the new use of `lexical'. + 2013-09-09 Dmitry Antipov <dmantipov@yandex.ru> Review and drop old frame resize hack. @@ -20,8 +24,8 @@ 2013-09-09 Dmitry Antipov <dmantipov@yandex.ru> Cleanup frame flushing. - * dispextern.h (struct redisplay_interface): Drop - flush_display_optional because flush_display is enough + * dispextern.h (struct redisplay_interface): + Drop flush_display_optional because flush_display is enough for X and flushing via RIF is just a no-op for others. * frame.h (flush_frame): New function. * 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. */) DEFUN ("eval", Feval, Seval, 1, 2, 0, doc: /* Evaluate FORM and return its value. -If LEXICAL is t, evaluate using lexical scoping. */) +If LEXICAL is t, evaluate using lexical scoping. +LEXICAL can also be an actual lexical environment, in the form of an +alist mapping symbols to their value. */) (Lisp_Object form, Lisp_Object lexical) { ptrdiff_t count = SPECPDL_INDEX (); |