Merge from emacs-23

[gnu-emacs] / lisp / play / dissociate.el

diff --git a/lisp/play/dissociate.el b/lisp/play/dissociate.el
index 01b06c89582b68ad5af246694875118833951d5a..17ec375035fa92e9eab7f3ee16ab371681ee5077 100644 (file)
--- a/lisp/play/dissociate.el
+++ b/lisp/play/dissociate.el
@@ -1,7 +1,7 @@
 ;;; dissociate.el --- scramble text amusingly for Emacs
 
 ;; Copyright (C) 1985, 2001, 2002, 2003, 2004, 2005,
-;;   2006, 2007, 2008 Free Software Foundation, Inc.
+;;   2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: games
@@ -62,8 +62,7 @@ Default is 2."
                   (setq last-query-point (point-max))
                   t))))
       (let (start end)
-       (save-excursion
-        (set-buffer inbuf)
+       (with-current-buffer inbuf
         (setq start (point))
         (if (eq move-function 'forward-char)
             (progn
@@ -81,8 +80,7 @@ Default is 2."
           (end-of-line)
           (and (> (current-column) fill-column)
                (do-auto-fill)))))
-      (save-excursion
-       (set-buffer inbuf)
+      (with-current-buffer inbuf
        (if (eobp)
           (goto-char (point-min))
         (let ((overlap