(bb-up, bb-down): Revert 2007-10-21 change and

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

diff --git a/lisp/play/yow.el b/lisp/play/yow.el
index c23bd706abd1f140d10045badd5a959e26b1d55c..702052f52d6abdc43c77d98b9d32af8232e8cfa4 100644 (file)
--- a/lisp/play/yow.el
+++ b/lisp/play/yow.el
@@ -1,6 +1,7 @@
 ;;; yow.el --- quote random zippyisms
 
-;; Copyright (C) 1993, 1994, 1995, 2000 Free Software Foundation, Inc.
+;; Copyright (C) 1993, 1994, 1995, 2000, 2001, 2002, 2003, 2004,
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Author: Richard Mlynarik
@@ -10,7 +11,7 @@
 
 ;; 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)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
@@ -20,8 +21,8 @@
 
 ;; 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., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
@@ -49,13 +50,13 @@
 (defconst yow-after-load-message "I have SEEN the CONSING!!")
 
 ;;;###autoload
-(defun yow (&optional insert)
+(defun yow (&optional insert display)
   "Return or display a random Zippy quotation.  With prefix arg, insert it."
-  (interactive "P")
+  (interactive "P\np")
   (let ((yow (cookie yow-file yow-load-message yow-after-load-message)))
     (cond (insert
           (insert yow))
-         ((not (interactive-p))
+         ((not display)
           yow)
          (t
           (message "%s" yow)))))
@@ -101,7 +102,8 @@ If called interactively, display a list of matches."
                     (while l
                       (princ (car l))
                       (setq l (cdr l))
-                      (and l (princ "\n\n"))))))))
+                      (and l (princ "\n\n")))
+                   (print-help-return-message))))))
     matches))
 
 \f
@@ -110,6 +112,8 @@ If called interactively, display a list of matches."
 ;;
 ;; written by Kayvan Aghaiepour
 
+(declare-function doctor-ret-or-read "doctor" (arg))
+
 ;;;###autoload
 (defun psychoanalyze-pinhead ()
   "Zippy goes to the analyst."
@@ -126,4 +130,5 @@ If called interactively, display a list of matches."
 
 (provide 'yow)
 
+;;; arch-tag: d13db89b-84f1-4141-a5ce-261d1733a65c
 ;;; yow.el ends here