2 files changed, 12 insertions, 8 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 40434d68520..f7ffeba650d 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2008-09-20  Justin Bogner  <mail@justinbogner.com>  (tiny change)
+
+        * play/fortune.el (fortune-program-options): Change to a list.
+        (fortune-in-buffer): Use apply.
+
 2008-09-20  Ulrich Mueller  <ulm@kph.uni-mainz.de>
 
         * emacs-lisp/authors.el: Change encoding of file to utf-8.
diff --git a/lisp/play/fortune.el b/lisp/play/fortune.el
index 5e25ebae1fe..5c7d2d21b8e 100644
--- a/lisp/play/fortune.el
+++ b/lisp/play/fortune.el
@@ -87,9 +87,9 @@ Normally you won't have a reason to change it."
   "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 ()
+  "Options to pass to the fortune program."
+  :type '(repeat string)
   :group 'fortune)
 (defcustom fortune-strfile "strfile"
   "Program to compute a new fortune database."
@@ -299,11 +299,10 @@ when supplied, specifies the file to choose the fortune from."
       (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)))))
-
+      (apply 'call-process
+             fortune-program  ;; program to call
+             nil fortune-buffer nil ;; INFILE BUFFER DISPLAYP
+             fort-file fortune-program-options))))
 
 ;;;###autoload
 (defun fortune (&optional file)