X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/32ccc8a5747ec380a9375251e1285264356b8866..1ba6f2c7bbacfda2bb014d30cfb3999146943de8:/lisp/play/dissociate.el

diff --git a/lisp/play/dissociate.el b/lisp/play/dissociate.el
index 1c0e89e7c7..b0fcc44ac1 100644
--- a/lisp/play/dissociate.el
+++ b/lisp/play/dissociate.el
@@ -1,17 +1,16 @@
 ;;; dissociate.el --- scramble text amusingly for Emacs
 
-;; Copyright (C) 1985, 2001, 2002, 2003, 2004, 2005,
-;;   2006, 2007 Free Software Foundation, Inc.
+;; Copyright (C) 1985, 2001-2016 Free Software Foundation, Inc.
 
-;; Maintainer: FSF
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: games
 
 ;; This file is part of GNU Emacs.
 
-;; GNU Emacs is free software; you can redistribute it and/or modify
+;; GNU Emacs is free software: you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -19,9 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -64,8 +61,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
@@ -83,8 +79,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
@@ -99,9 +94,6 @@ Default is 2."
 		 (funcall search-function overlap opoint t))))))
       (sit-for 0))))
 
-(random t)
-
 (provide 'dissociate)
 
-;;; arch-tag: 90d197d1-409b-45c5-a0b5-fbfb2e06334f
 ;;; dissociate.el ends here