diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8edbfe85823..df2a2315504 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2010-09-17  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+	* obsolete/old-whitespace.el (whitespace-rescan-files-in-buffers):
+	Use with-current-buffer.
+
 	* isearch.el (isearch-face): Rename from `isearch'.
 	(isearch-highlight): Use new name.
 
diff --git a/lisp/obsolete/old-whitespace.el b/lisp/obsolete/old-whitespace.el
index 0245537faaa..71568f98d55 100644
--- a/lisp/obsolete/old-whitespace.el
+++ b/lisp/obsolete/old-whitespace.el
@@ -725,9 +725,8 @@ If timer is not set, then set it to scan the files in
 	(setq bufname (cadr thiselt))
 	(setq buf (get-buffer bufname))
 	(if (buffer-live-p buf)
-	    (save-excursion
+	    (with-current-buffer bufname
 	      ;;(message "buffer %s live" bufname)
-	      (set-buffer bufname)
 	      (if whitespace-mode
 		  (progn
 		    ;;(message "checking for whitespace in %s" bufname)