;;; fortune.el --- use fortune to create signatures
-;; Copyright (C) 1999, 2001, 2002, 2003, 2004,
-;; 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+;; Copyright (C) 1999, 2001-2013 Free Software Foundation, Inc.
;; Author: Holger Schauer <Holger.Schauer@gmx.de>
;; Keywords: games utils mail
;; I have also this in my .gnus:
;;(add-hook 'gnus-article-mode-hook
-;; '(lambda ()
+;; (lambda ()
;; (define-key gnus-article-mode-map "i" 'fortune-from-region)))
;; which allows marking a region and then pressing "i" so that the marked
-;; region will be automatically added to my favourite fortune-file.
+;; region will be automatically added to my favorite fortune-file.
;;; Code:
:group 'mail)
(defcustom fortune-dir "~/docs/ascii/misc/fortunes/"
- "*The directory to look in for local fortune cookies files."
+ "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."
+ "The file in which local fortune cookies will be stored."
:type 'file
:group 'fortune)
(defcustom fortune-database-extension ".dat"
"Program to select a fortune cookie."
:type 'string
:group 'fortune)
-(defcustom fortune-program-options ""
- "Options to pass to the fortune program (a string)."
- :type 'string
+(defcustom fortune-program-options ()
+ "List of options to pass to the fortune program."
+ :type '(choice (repeat (string :tag "Option"))
+ (string :tag "Obsolete string of options"))
+ :version "23.1"
:group 'fortune)
(defcustom fortune-strfile "strfile"
"Program to compute a new fortune database."
:group 'fortune)
(defcustom fortune-always-compile t
- "*Non-nil means automatically compile fortune files.
+ "Non-nil means automatically compile fortune files.
If nil, you must invoke `fortune-compile' manually to do that."
:type 'boolean
:group 'fortune)
:type 'string
:group 'fortune-signature)
(defcustom fortune-sigstart ""
- "*Some text to insert before the fortune cookie, in a mail signature."
+ "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."
+ "Some text to insert after the fortune cookie, in a mail signature."
:type 'string
:group 'fortune-signature)
(substitute-in-file-name
(concat fortune-file fortune-database-extension)))))
(cond ((file-exists-p fortune-file)
- (if (file-exists-p fortune-dat)
- (cond ((file-newer-than-file-p fortune-file fortune-dat)
- (message "Compiling new fortune database %s" fortune-dat)
- (shell-command
- (concat fortune-strfile fortune-strfile-options
- " " fortune-file fortune-quiet-strfile-options))))))
+ (cond ((file-newer-than-file-p fortune-file fortune-dat)
+ (message "Compiling new fortune database %s" fortune-dat)
+ (shell-command
+ (concat fortune-strfile fortune-strfile-options
+ " " fortune-file fortune-quiet-strfile-options)))))
(t (error "Can't compile fortune file %s" fortune-file)))))
;;; **************
;;; Display fortune
-(defun fortune-in-buffer (interactive &optional file)
+(defun fortune-in-buffer (_interactive &optional file)
"Put a fortune cookie in the *fortune* buffer.
-
-INTERACTIVE is ignored. Optional argument FILE,
-when supplied, specifies the file to choose the fortune from."
+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)))
(fort-file (expand-file-name
(substitute-in-file-name
(or file fortune-file)))))
- (save-excursion
- (set-buffer fortune-buffer)
- (toggle-read-only 0)
- (erase-buffer)
-
- (if fortune-always-compile
- (fortune-compile fort-file))
-
- (call-process
- fortune-program ;; programm to call
- nil fortune-buffer nil ;; INFILE BUFFER DISPLAYP
- (concat fortune-program-options fort-file)))))
-
+ (with-current-buffer fortune-buffer
+ (let ((inhibit-read-only t))
+ (erase-buffer)
+ (if fortune-always-compile
+ (fortune-compile fort-file))
+ (apply 'call-process
+ fortune-program ; program to call
+ nil fortune-buffer nil ; INFILE BUFFER DISPLAY
+ (append (if (stringp fortune-program-options)
+ (split-string fortune-program-options)
+ fortune-program-options) (list fort-file)))))))
;;;###autoload
(defun fortune (&optional file)
"Display a fortune cookie.
-
If called with a prefix asks for the FILE to choose the fortune from,
otherwise uses the value of `fortune-file'. If you want to have fortune
choose from a set of files in a directory, call interactively with prefix
and choose the directory as the fortune-file."
- (interactive
- (list
- (if current-prefix-arg
- (fortune-ask-file)
- fortune-file)))
+ (interactive (list (if current-prefix-arg
+ (fortune-ask-file)
+ fortune-file)))
(fortune-in-buffer t file)
(switch-to-buffer (get-buffer fortune-buffer-name))
- (toggle-read-only 1))
+ (setq buffer-read-only t))
;;; Provide ourselves.
(provide 'fortune)
-;; arch-tag: a1e4cb8a-3792-40e7-86a7-fc75ce094bcc
;;; fortune.el ends here
HCoop / bpt / emacs.git / blobdiff