merge emacs-23

[bpt/emacs.git] / lisp / play / yow.el

diff --git a/lisp/play/yow.el b/lisp/play/yow.el
index 407c96a..72fd013 100644 (file)
--- a/lisp/play/yow.el
+++ b/lisp/play/yow.el
@@ -1,7 +1,7 @@
 ;;; yow.el --- quote random zippyisms
 
-;; Copyright (C) 1993, 1994, 1995, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006, 2007 Free Software Foundation, Inc.
+;; Copyright (C) 1993, 1994, 1995, 2000, 2001, 2002, 2003, 2004, 2005,
+;;   2006, 2007, 2008, 2009, 2010  Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Author: Richard Mlynarik
@@ -9,10 +9,10 @@
 
 ;; 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
@@ -20,9 +20,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:
 
@@ -93,7 +91,7 @@ If called interactively, display a list of matches."
         (setq i (1+ i))))
     (and matches
          (setq matches (sort matches 'string-lessp)))
-    (and (interactive-p)
+    (and (called-interactively-p 'interactive)
          (cond ((null matches)
                 (message "No matches found."))
                (t
@@ -103,7 +101,7 @@ If called interactively, display a list of matches."
                       (princ (car l))
                       (setq l (cdr l))
                       (and l (princ "\n\n")))
-                   (print-help-return-message))))))
+                   (help-print-return-message))))))
     matches))
 
 \f
@@ -112,6 +110,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."
@@ -128,5 +128,5 @@ If called interactively, display a list of matches."
 
 (provide 'yow)
 
-;;; arch-tag: d13db89b-84f1-4141-a5ce-261d1733a65c
+;; arch-tag: d13db89b-84f1-4141-a5ce-261d1733a65c
 ;;; yow.el ends here