Changes from arch/CVS synchronization

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

diff --git a/lisp/play/fortune.el b/lisp/play/fortune.el
index 0ae1a841f430fec57e7d8798d308f2cb42984b15..306cf7daac15b1fd2bf258fdaa4bcb3e6db4c922 100644 (file)
--- a/lisp/play/fortune.el
+++ b/lisp/play/fortune.el
@@ -1,10 +1,11 @@
-;;; fortune.el --- Use fortune to create signatures
+;;; fortune.el --- use fortune to create signatures
+
 ;; Copyright (C) 1999, 2001 Free Software Foundation, Inc.
 
 ;; Author: Holger Schauer <Holger.Schauer@gmx.de>
 ;; Keywords: games utils mail
 
-;; This file is part of Emacs.
+;; This file is part of GNU Emacs.
 
 ;; 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
@@ -33,8 +34,8 @@
 
 ;;; Installation:
 
-;; Please check the customize settings - you will at least have to modify the
-;; values of `fortune-dir' and `fortune-file'.
+;; Please check the customize settings -- you will at least have to
+;; modify the values of `fortune-dir' and `fortune-file'.
 
 ;; I then use this in my .gnus:
 ;;(message "Making new signature: %s" (fortune-to-signature "~/fortunes/"))
@@ -44,9 +45,7 @@
 
 ;; If you like to get a new signature for every message, you can also hook
 ;; it into message-mode:
-;; (add-hook 'message-setup-hook
-;;           '(lambda ()
-;;              (fortune-to-signature)))
+;; (add-hook 'message-setup-hook 'fortune-to-signature)
 ;; This time no fortune-file is specified, so fortune-to-signature would use
 ;; the default-file as specified by fortune-file.
 
@@ -63,6 +62,7 @@
 ;;; Customizable Settings
 (defgroup fortune nil
   "Settings for fortune."
+  :link '(emacs-commentary-link "fortune.el")
   :version "21.1"
   :group 'games)
 (defgroup fortune-signature nil
@@ -72,42 +72,53 @@
 
 (defcustom fortune-dir "~/docs/ascii/misc/fortunes/"
   "*The directory to look in for local fortune cookies files."
+  :type 'directory
   :group 'fortune)
 (defcustom fortune-file
   (expand-file-name "usenet" fortune-dir)
   "*The file in which local fortune cookies will be stored."
+  :type 'file
   :group 'fortune)
 (defcustom fortune-database-extension  ".dat"
   "The extension of the corresponding fortune database.
 Normally you won't have a reason to change it."
+  :type 'string
   :group 'fortune)
 (defcustom fortune-program "fortune"
   "Program to select a fortune cookie."
+  :type 'string
   :group 'fortune)
 (defcustom fortune-program-options ""
-  "Options to pass to the fortune program."
+  "Options to pass to the fortune program (a string)."
+  :type 'string
   :group 'fortune)
 (defcustom fortune-strfile "strfile"
   "Program to compute a new fortune database."
+  :type 'string
   :group 'fortune)
 (defcustom fortune-strfile-options ""
-  "Options to pass to the strfile program."
+  "Options to pass to the strfile program (a string)."
+  :type 'string
   :group 'fortune)
 (defcustom fortune-quiet-strfile-options "> /dev/null"
   "Text added to the command for running `strfile'.
 By default it discards the output produced by `strfile'.
 Set this to \"\" if you would like to see the output."
+  :type 'string
   :group 'fortune)
 
 (defcustom fortune-always-compile t
   "*Non-nil means automatically compile fortune files.
 If nil, you must invoke `fortune-compile' manually to do that."
+  :type 'boolean
   :group 'fortune)
 (defcustom fortune-author-line-prefix "                  -- "
   "Prefix to put before the author name of a fortunate."
+  :type 'string
   :group 'fortune-signature)
 (defcustom fortune-fill-column fill-column
   "Fill column for fortune files."
+  :type 'integer
   :group 'fortune-signature)
 (defcustom fortune-from-mail "private e-mail"
   "String to use to characterize that the fortune comes from an e-mail.
@@ -116,9 +127,11 @@ No need to add an `in'."
   :group 'fortune-signature)
 (defcustom fortune-sigstart ""
   "*Some text to insert before the fortune cookie, in a mail signature."
+  :type 'string
   :group 'fortune-signature)
 (defcustom fortune-sigend ""
   "*Some text to insert after the fortune cookie, in a mail signature."
+  :type 'string
   :group 'fortune-signature)
 
 
@@ -201,9 +214,9 @@ read the file name to use.  Otherwise use the value of `fortune-file'."
             (point-max) t))
       (if help-point
          (setq newsgroup (buffer-substring (match-beginning 1) help-point))
-       (setq newsgroup (if (or (eql major-mode 'gnus-article-mode)
-                               (eql major-mode 'vm-mode)
-                               (eql major-mode 'rmail-mode))
+       (setq newsgroup (if (or (eq major-mode 'gnus-article-mode)
+                               (eq major-mode 'vm-mode)
+                               (eq major-mode 'rmail-mode))
                            fortune-from-mail
                          "unknown"))))
 
@@ -240,8 +253,8 @@ the value of `fortune-file'.  This currently cannot handle directories."
                     (concat fortune-strfile fortune-strfile-options
                             " " fortune-file fortune-quiet-strfile-options))))))
        (t (error "Can't compile fortune file %s" fortune-file)))))
-  
-        
+
+
 ;;; **************
 ;;; Use fortune for signature
 ;;;###autoload
@@ -314,5 +327,5 @@ and choose the directory as the fortune-file."
 ;;; Provide ourselves.
 (provide 'fortune)
 
+;;; arch-tag: a1e4cb8a-3792-40e7-86a7-fc75ce094bcc
 ;;; fortune.el ends here
-