diff options
| author | Tassilo Horn <tassilo@member.fsf.org> | 2008-09-22 10:24:31 +0000 |
|---|---|---|
| committer | Tassilo Horn <tassilo@member.fsf.org> | 2008-09-22 10:24:31 +0000 |
| commit | b45c803b1039695cf21c682d1339248c26af4c4e (patch) | |
| tree | d364c28b867ef4417532de13e7a5b664da8b47bd | |
| parent | 9ba6e7d4b6902bd12f524cf51ba4bb74bfcd03fe (diff) | |
| download | emacs-b45c803b1039695cf21c682d1339248c26af4c4e.tar.gz | |
(fortune-in-buffer): Fix a bug which forced
usage of `fortune-file' even though a FILE argument was passed to
the function.
| -rw-r--r-- | lisp/ChangeLog | 6 | ||||
| -rw-r--r-- | lisp/play/fortune.el | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index da8b2f3cc93..6de4bd738d3 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2008-09-22 Tassilo Horn <tassilo@member.fsf.org> + + * play/fortune.el (fortune-in-buffer): Fix a bug which forced + usage of `fortune-file' even though a FILE argument was passed to + the function. + 2008-09-21 Dan Nicolaescu <dann@ics.uci.edu> * startup.el (command-line): Start the server when in daemon mode. diff --git a/lisp/play/fortune.el b/lisp/play/fortune.el index 2d548c3b220..1e8e7315372 100644 --- a/lisp/play/fortune.el +++ b/lisp/play/fortune.el @@ -306,7 +306,7 @@ when supplied, specifies the file to choose the fortune from." nil fortune-buffer nil ; INFILE BUFFER DISPLAY (append (if (stringp fortune-program-options) (split-string fortune-program-options) - fortune-program-options) (list fortune-file)))))) + fortune-program-options) (list fort-file)))))) ;;;###autoload (defun fortune (&optional file) |