(ewoc--set-buffer-bind-dll-let*): Use `with-current-buffer'.

2 files changed, 9 insertions, 8 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4d6708c8a35..385bf640a7c 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2006-05-08  Thien-Thi Nguyen  <ttn@gnu.org>
+
+        * emacs-lisp/ewoc.el (ewoc--set-buffer-bind-dll-let*):
+        Use with-current-buffer.
+
 2006-05-07  Kim F. Storm  <storm@cua.dk>
 
         * subr.el (add-to-history): Remove keep-dups arg.
diff --git a/lisp/emacs-lisp/ewoc.el b/lisp/emacs-lisp/ewoc.el
index 74931c3c34a..278ffe6e7ca 100644
--- a/lisp/emacs-lisp/ewoc.el
+++ b/lisp/emacs-lisp/ewoc.el
@@ -221,16 +221,12 @@ dll bound to ewoc--dll, and VARLIST bound as in a let*.
 dll will be bound when VARLIST is initialized, but the current
 buffer will *not* have been changed.
 Return value of last form in FORMS."
-  (let ((old-buffer (make-symbol "old-buffer"))
-        (hnd (make-symbol "ewoc")))
-    `(let* ((,old-buffer (current-buffer))
-            (,hnd ,ewoc)
+  (let ((hnd (make-symbol "ewoc")))
+    `(let* ((,hnd ,ewoc)
             (dll (ewoc--dll ,hnd))
             ,@varlist)
-      (set-buffer (ewoc--buffer ,hnd))
-      (unwind-protect
-           (progn ,@forms)
-        (set-buffer ,old-buffer)))))
+       (with-current-buffer (ewoc--buffer ,hnd)
+         ,@forms))))
 
 (defmacro ewoc--set-buffer-bind-dll (ewoc &rest forms)
   `(ewoc--set-buffer-bind-dll-let* ,ewoc nil ,@forms))