From a2d8969d897c49cbb0b1bc7b27fe696becd265d4 Mon Sep 17 00:00:00 2001 From: Lars Magne Ingebrigtsen Date: Sun, 3 Jul 2011 21:30:01 +0200 Subject: [PATCH] Back out last commit since we do not have papers from the actual author. --- lisp/ChangeLog | 5 ----- lisp/play/fortune.el | 24 +++++++++--------------- 2 files changed, 9 insertions(+), 20 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 0881f9f5982..6949d776821 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,8 +1,3 @@ -2011-07-03 Juanma Barranquero - - * play/fortune.el (fortune-compile): Make a new fortune dat file - compile time if the dat file does not exist (bug#5338). - 2011-07-03 Richard Kim (tiny change) * textmodes/texnfo-upd.el (texinfo-insert-menu): Don't insert diff --git a/lisp/play/fortune.el b/lisp/play/fortune.el index e675302755c..55b0a564fef 100644 --- a/lisp/play/fortune.el +++ b/lisp/play/fortune.el @@ -244,21 +244,15 @@ the value of `fortune-file'. This currently cannot handle directories." (let* ((fortune-file (expand-file-name (substitute-in-file-name file))) (fortune-dat (expand-file-name (substitute-in-file-name - (concat fortune-file fortune-database-extension)))) - (fortune-file-exist (file-exists-p fortune-file)) - (fortune-dat-exist (file-exists-p fortune-dat)) - (fortune-file-newer (file-newer-than-file-p - fortune-file fortune-dat))) - (cond - (fortune-file-exist - (if (or (not fortune-dat-exist) - (and fortune-dat-exist - fortune-file-newer)) - (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))))) + (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)))))) + (t (error "Can't compile fortune file %s" fortune-file))))) ;;; ************** -- 2.39.2