diff options
| author | Kenichi Handa | 2012-08-28 22:44:20 +0900 |
|---|---|---|
| committer | Kenichi Handa | 2012-08-28 22:44:20 +0900 |
| commit | 4eb4de01df384be9b8d811f7ab476eeb37ece748 (patch) | |
| tree | d04f0dae31dd8b533a0c3cd738430841ce7ebb84 /src/editfns.c | |
| parent | fabc1281e9cde34ff9a19d843316d2ceca8647ad (diff) | |
| parent | 4f2daf31078e2cc059710e129dffe0beed8fc7c2 (diff) | |
| download | emacs-4eb4de01df384be9b8d811f7ab476eeb37ece748.tar.gz emacs-4eb4de01df384be9b8d811f7ab476eeb37ece748.zip | |
merge trunk
Diffstat (limited to 'src/editfns.c')
| -rw-r--r-- | src/editfns.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/editfns.c b/src/editfns.c index 0bd632d14b7..7b451e4e443 100644 --- a/src/editfns.c +++ b/src/editfns.c | |||
| @@ -946,13 +946,10 @@ BODY is executed just like `progn'. | |||
| 946 | usage: (save-current-buffer &rest BODY) */) | 946 | usage: (save-current-buffer &rest BODY) */) |
| 947 | (Lisp_Object args) | 947 | (Lisp_Object args) |
| 948 | { | 948 | { |
| 949 | Lisp_Object val; | ||
| 950 | ptrdiff_t count = SPECPDL_INDEX (); | 949 | ptrdiff_t count = SPECPDL_INDEX (); |
| 951 | 950 | ||
| 952 | record_unwind_protect (set_buffer_if_live, Fcurrent_buffer ()); | 951 | record_unwind_current_buffer (); |
| 953 | 952 | return unbind_to (count, Fprogn (args)); | |
| 954 | val = Fprogn (args); | ||
| 955 | return unbind_to (count, val); | ||
| 956 | } | 953 | } |
| 957 | 954 | ||
| 958 | DEFUN ("buffer-size", Fbufsize, Sbufsize, 0, 1, 0, | 955 | DEFUN ("buffer-size", Fbufsize, Sbufsize, 0, 1, 0, |