Merge from trunk.

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

diff --git a/lisp/play/fortune.el b/lisp/play/fortune.el
index 05775c8a85e5af2b72d430ce1c17e5a2b2b2c90b..61de49aadf0a7b363957134f31c6c6a80e833d8b 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-2012  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:
 
@@ -282,7 +282,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."