From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Tue, 28 Aug 2012 20:14:21 +0000 (-0400)
Subject: * cl-lib.el (buffer-string): Simplify last change.
X-Git-Tag: emacs-24.2.90~481
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=d5e2bcd3514bbf1a4e7022efd3b6555379d690a8;p=emacs.git

* cl-lib.el (buffer-string): Simplify last change.

Fixes: debbugs:12293
---

diff --git a/lisp/emacs-lisp/cl-lib.el b/lisp/emacs-lisp/cl-lib.el
index 7239b5bd8ca..532c81c502c 100644
--- a/lisp/emacs-lisp/cl-lib.el
+++ b/lisp/emacs-lisp/cl-lib.el
@@ -635,8 +635,7 @@ If ALIST is non-nil, the new pairs are prepended to it."
      (set-buffer-modified-p ,flag)))
 (gv-define-simple-setter buffer-name rename-buffer t)
 (gv-define-setter buffer-string (store)
-  ;; Eval `store' first since it may look at the buffer.
-  (macroexp-let2 nil s store `(progn (erase-buffer) (insert ,s))))
+  `(insert (prog1 ,store (erase-buffer))))
 (gv-define-simple-setter buffer-substring cl--set-buffer-substring)
 (gv-define-simple-setter current-buffer set-buffer)
 (gv-define-simple-setter current-case-table set-case-table)