* lisp/term/xterm.el (xterm-function-map): Support format used with

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

diff --git a/lisp/play/fortune.el b/lisp/play/fortune.el
index 05775c8..cb58c0d 100644 (file)
--- a/lisp/play/fortune.el
+++ b/lisp/play/fortune.el
@@ -1,6 +1,6 @@
 ;;; fortune.el --- use fortune to create signatures
 
-;; Copyright (C) 1999, 2001-2011  Free Software Foundation, Inc.
+;; Copyright (C) 1999, 2001-2013 Free Software Foundation, Inc.
 
 ;; Author: Holger Schauer <Holger.Schauer@gmx.de>
 ;; Keywords: games utils mail
@@ -49,10 +49,10 @@
 
 ;; 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:
 
@@ -246,12 +246,11 @@ the value of `fortune-file'.  This currently cannot handle directories."
                       (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)))))
 
 
@@ -282,7 +281,7 @@ and choose the directory as the 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."