Merge from emacs-23

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

diff --git a/lisp/play/spook.el b/lisp/play/spook.el
index 1b4bce4..d96e615 100644 (file)
--- a/lisp/play/spook.el
+++ b/lisp/play/spook.el
@@ -1,6 +1,7 @@
 ;;; spook.el --- spook phrase utility for overloading the NSA line eater
 
-;; Copyright (C) 1988 Free Software Foundation, Inc.
+;; Copyright (C) 1988, 1993, 2001, 2002, 2003, 2004,
+;;   2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: games
@@ -8,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
@@ -19,43 +20,61 @@
 ;; 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, 675 Mass Ave, Cambridge, MA 02139, USA.
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
-; Steve Strassmann <straz@media-lab.media.mit.edu> didn't write
-; this, and even if he did, he really didn't mean for you to use it
-; in an anarchistic way.
-;
-; To use this:
-;  Just before sending mail, do M-x spook.
-;  A number of phrases will be inserted into your buffer, to help
-;  give your message that extra bit of attractiveness for automated
-;  keyword scanners.  Help defeat the NSA trunk trawler!
+;; Steve Strassmann <straz@media-lab.media.mit.edu> didn't write
+;; this, and even if he did, he really didn't mean for you to use it
+;; in an anarchistic way.
+;;
+;; To use this:
+;;  Just before sending mail, do M-x spook.
+;;  A number of phrases will be inserted into your buffer, to help
+;;  give your message that extra bit of attractiveness for automated
+;;  keyword scanners.  Help defeat the NSA trunk trawler!
 
 ;;; Code:
 
-(require 'cookie)
+(require 'cookie1)
 
 ; Variables
-(defvar spook-phrases-file (concat data-directory "spook.lines")
-   "Keep your favorite phrases here.")
+(defgroup spook nil
+  "Spook phrase utility for overloading the NSA line eater."
+  :prefix "spook-"
+  :group 'games)
 
-(defvar spook-phrase-default-count 15
-   "Default number of phrases to insert")
+(defcustom spook-phrases-file (expand-file-name "spook.lines" data-directory)
+  "Keep your favorite phrases here."
+  :type 'file
+  :group 'spook)
+
+(defcustom spook-phrase-default-count 15
+  "Default number of phrases to insert."
+  :type 'integer
+  :group 'spook)
 
 ;;;###autoload
 (defun spook ()
   "Adds that special touch of class to your outgoing mail."
   (interactive)
-  (cookie-insert
-   spook-phrases-file
-   spook-phrase-default-count
-   "Checking authorization"
-   "Checking authorization...Approved"))
+  (cookie-insert spook-phrases-file
+                spook-phrase-default-count
+                "Checking authorization..."
+                "Checking authorization...Approved"))
+
+;;;###autoload
+(defun snarf-spooks ()
+  "Return a vector containing the lines from `spook-phrases-file'."
+  (cookie-snarf spook-phrases-file
+               "Checking authorization..."
+               "Checking authorization...Approved"))
+
+;; Note: the implementation that used to take up most of this file has been
+;; cleaned up, generalized, gratuitously broken by esr, and now resides in
+;; cookie1.el.
 
-;; Note: the implementation that used to take up most of this file has
-;; been cleaned up and generalized and now resides in cookie.el.
+(provide 'spook)
 
+;; arch-tag: c682b61f-92b6-4492-9c0d-2367e562449c
 ;;; spook.el ends here