From 3c4a4b230388311d253e11787f2a9eb064056160 Mon Sep 17 00:00:00 2001 From: "Kirill A. Korinskiy" Date: Wed, 13 Feb 2013 00:10:41 -0800 Subject: [PATCH] fortune-compile tiny change * lisp/play/fortune.el (fortune-compile): Also make the compiled file if it does not exist at all, not just if it is old. Fixes: debbugs:5338 --- lisp/ChangeLog | 5 +++++ lisp/play/fortune.el | 20 +++++++++++--------- 2 files changed, 16 insertions(+), 9 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index c607f51d0f3..34bc1aaf024 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2013-02-13 Kirill A. Korinskiy + + * play/fortune.el (fortune-compile): Also make the compiled file + if it does not exist at all, not just if it is old. (Bug#5338) + 2013-02-13 Glenn Morris * emacs-lisp/package.el (package-menu-execute): Doc fix. diff --git a/lisp/play/fortune.el b/lisp/play/fortune.el index 17ab6f98254..0920012b280 100644 --- a/lisp/play/fortune.el +++ b/lisp/play/fortune.el @@ -244,15 +244,17 @@ 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))))) - (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))))) + (concat fortune-file fortune-database-extension)))) + (fortune-dat-exist (file-exists-p fortune-dat))) + (cond ((file-exists-p fortune-file) + (if (or (not fortune-dat-exist) + (and fortune-dat-exist + (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.5