Merged in changes from CVS trunk.

Patches applied:

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-653
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-654
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-655
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-656
   Update from CVS: lisp/man.el (Man-xref-normal-file): Fix help-echo.

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-657
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-658
   Merge from gnus--rel--5.10

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-659
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-660
   Merge from gnus--rel--5.10

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-661
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-662
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-663
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-664
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-665
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-666
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-667
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-668
   Merge from gnus--rel--5.10

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-669
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-670
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-671
   Update from CVS

 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-64
   Update from CVS

 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-65
   Update from CVS

 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-66
   Update from CVS

 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-67
   Update from CVS

 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-68
   Update from CVS

git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-264

2 files changed, 4 insertions, 5 deletions

diff --git a/lisp/play/5x5.el b/lisp/play/5x5.el
index 886e53a6afa..83d67958f44 100644
--- a/lisp/play/5x5.el
+++ b/lisp/play/5x5.el
@@ -224,9 +224,8 @@ Quit current game         \\[5x5-quit-game]"
           5x5-y-pos (/ 5x5-grid-size 2)
           5x5-moves 0
           5x5-grid  (5x5-make-move (5x5-make-new-grid) 5x5-y-pos 5x5-x-pos))
-    (when (interactive-p)
-      (5x5-draw-grid (list 5x5-grid))
-      (5x5-position-cursor))))
+    (5x5-draw-grid (list 5x5-grid))
+    (5x5-position-cursor)))
 
 (defun 5x5-quit-game ()
   "Quit the current game of `5x5'."
diff --git a/lisp/play/fortune.el b/lisp/play/fortune.el
index 306cf7daac1..3919f57e78c 100644
--- a/lisp/play/fortune.el
+++ b/lisp/play/fortune.el
@@ -271,7 +271,7 @@ and choose the directory as the fortune-file."
          (fortune-ask-file)
        fortune-file)))
    (save-excursion
-    (fortune-in-buffer (interactive-p) file)
+    (fortune-in-buffer t file)
     (set-buffer fortune-buffer-name)
     (let* ((fortune (buffer-string))
            (signature (concat fortune-sigstart fortune fortune-sigend)))
@@ -285,7 +285,7 @@ and choose the directory as the fortune-file."
 (defun fortune-in-buffer (interactive &optional file)
   "Put a fortune cookie in the *fortune* buffer.
 
-When INTERACTIVE is nil, don't display it.  Optional argument FILE,
+INTERACTIVE is ignored.  Optional argument FILE,
 when supplied, specifies the file to choose the fortune from."
   (let ((fortune-buffer (or (get-buffer fortune-buffer-name)
                             (generate-new-buffer fortune-buffer-name)))