* riece-hangman.el (riece-hangman-word): Suppress byte-compile

warnings; `save-excursion' defeated by `set-buffer'.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f8e72ba..c8b7fd0 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2010-09-12  TAKAHASHI Kaoru  <kaoru@kaisei.org>
 
+       * riece-hangman.el (riece-hangman-word): Suppress byte-compile
+       warnings; `save-excursion' defeated by `set-buffer'.
+
        * riece-server.el (riece-reset-process-buffer): Suppress
        byte-compile warnings; `save-excursion' defeated by `set-buffer'.
 

diff --git a/lisp/riece-hangman.el b/lisp/riece-hangman.el
index 1d59f27..426935e 100644 (file)
--- a/lisp/riece-hangman.el
+++ b/lisp/riece-hangman.el
@@ -96,14 +96,12 @@ The wordlist is read from `riece-hangman-words-file'."
   (unless (and riece-hangman-words-buffer
               (buffer-name riece-hangman-words-buffer))
     (setq riece-hangman-words-buffer (generate-new-buffer " *riece-hangman*"))
-    (save-excursion
-      (set-buffer riece-hangman-words-buffer)
+    (with-current-buffer riece-hangman-words-buffer
       (buffer-disable-undo)
       (insert-file-contents riece-hangman-words-file)
       (let ((case-fold-search nil))
        (delete-non-matching-lines "^[a-z][a-z][a-z][a-z][a-z][a-z]+"))))
-  (save-excursion
-    (set-buffer riece-hangman-words-buffer)
+  (with-current-buffer riece-hangman-words-buffer
     (goto-char (1+ (random (buffer-size))))
     (if (eobp)
        (beginning-of-line -1)