[Emacs-diffs] /srv/bzr/emacs/trunk r109809: * cl-lib.el (buffer-string): Simplify last change.

[Stefan Monnier]

------------------------------------------------------------
revno: 109809
fixes bug: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=12293
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Tue 2012-08-28 16:14:21 -0400
message:
  * cl-lib.el (buffer-string): Simplify last change.
modified:
  lisp/emacs-lisp/cl-lib.el

=== modified file 'lisp/emacs-lisp/cl-lib.el'
--- a/lisp/emacs-lisp/cl-lib.el 2012-08-28 19:35:35 +0000
+++ b/lisp/emacs-lisp/cl-lib.el 2012-08-28 20:14:21 +0000
@@ -635,8 +635,7 @@
      (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)