* [PATCH] Make a new fortune dat file in compile time if dat file not exist
@ 2010-01-08 2:20 Kirill A. Korinskiy
2010-01-08 10:12 ` bug#5338: " Juanma Barranquero
0 siblings, 1 reply; 7+ messages in thread
From: Kirill A. Korinskiy @ 2010-01-08 2:20 UTC (permalink / raw
To: emacs-devel; +Cc: Kirill A. Korinskiy
---
lisp/play/fortune.el | 24 +++++++++++++++---------
1 files changed, 15 insertions(+), 9 deletions(-)
diff --git a/lisp/play/fortune.el b/lisp/play/fortune.el
index 3b895c7..0f92085 100644
--- a/lisp/play/fortune.el
+++ b/lisp/play/fortune.el
@@ -245,15 +245,21 @@ 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-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)))))
;;; **************
--
1.6.2
^ permalink raw reply related [flat|nested] 7+ messages in thread
* bug#5338: [PATCH] Make a new fortune dat file in compile time if dat file not exist
2010-01-08 2:20 [PATCH] Make a new fortune dat file in compile time if dat file not exist Kirill A. Korinskiy
@ 2010-01-08 10:12 ` Juanma Barranquero
2011-07-03 19:33 ` Lars Magne Ingebrigtsen
0 siblings, 1 reply; 7+ messages in thread
From: Juanma Barranquero @ 2010-01-08 10:12 UTC (permalink / raw
To: bug-gnu-emacs
Package: emacs
Severity: minor
tags: patch
X-Debbugs-CC: Kirill A. Korinskiy <catap@catap.ru>
---------- Forwarded message ----------
From: Kirill A. Korinskiy <catap@catap.ru>
Date: Fri, Jan 8, 2010 at 03:20
Subject: [PATCH] Make a new fortune dat file in compile time if dat
file not exist
To: emacs-devel@gnu.org
Cc: "Kirill A. Korinskiy" <catap@catap.ru>
---
lisp/play/fortune.el | 24 +++++++++++++++---------
1 files changed, 15 insertions(+), 9 deletions(-)
diff --git a/lisp/play/fortune.el b/lisp/play/fortune.el
index 3b895c7..0f92085 100644
--- a/lisp/play/fortune.el
+++ b/lisp/play/fortune.el
@@ -245,15 +245,21 @@ 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-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)))))
;;; **************
--
1.6.2
^ permalink raw reply related [flat|nested] 7+ messages in thread
* bug#5338: [PATCH] Make a new fortune dat file in compile time if dat file not exist
2010-01-08 10:12 ` bug#5338: " Juanma Barranquero
@ 2011-07-03 19:33 ` Lars Magne Ingebrigtsen
2011-07-04 2:40 ` Chong Yidong
0 siblings, 1 reply; 7+ messages in thread
From: Lars Magne Ingebrigtsen @ 2011-07-03 19:33 UTC (permalink / raw
To: Juanma Barranquero; +Cc: Juanma Barranquero, Kirill A. Korinskiy, 5338
Juanma Barranquero <lekktu@gmail.com> writes:
> From: Kirill A. Korinskiy <catap@catap.ru>
> Date: Fri, Jan 8, 2010 at 03:20
> Subject: [PATCH] Make a new fortune dat file in compile time if dat
> file not exist
> To: emacs-devel@gnu.org, 5338@debbugs.gnu.org
> Cc: "Kirill A. Korinskiy" <catap@catap.ru>
[...]
> + (concat fortune-file fortune-database-extension))))
> + (fortune-file-exist (file-exists-p fortune-file))
> + (fortune-dat-exist (file-exists-p fortune-dat))
The patch looks correct to me, but I haven't used fortune.el in a long
while.
However, since this is more than 10 lines of new code, we need copyright
assignment papers from the author.
Do we have copyright assignment papers from Kirill A. Korinskiy on file?
--
(domestic pets only, the antidote for overdose, milk.)
bloggy blog http://lars.ingebrigtsen.no/
^ permalink raw reply [flat|nested] 7+ messages in thread
* bug#5338: [PATCH] Make a new fortune dat file in compile time if dat file not exist
2011-07-03 19:33 ` Lars Magne Ingebrigtsen
@ 2011-07-04 2:40 ` Chong Yidong
2011-07-04 7:53 ` Kirill A. Korinskiy
0 siblings, 1 reply; 7+ messages in thread
From: Chong Yidong @ 2011-07-04 2:40 UTC (permalink / raw
To: Lars Magne Ingebrigtsen; +Cc: Juanma Barranquero, Kirill A. Korinskiy, 5338
Lars Magne Ingebrigtsen <larsi@gnus.org> writes:
> Do we have copyright assignment papers from Kirill A. Korinskiy on file?
No.
^ permalink raw reply [flat|nested] 7+ messages in thread
* bug#5338: [PATCH] Make a new fortune dat file in compile time if dat file not exist
2011-07-04 2:40 ` Chong Yidong
@ 2011-07-04 7:53 ` Kirill A. Korinskiy
2011-07-04 9:38 ` Lars Magne Ingebrigtsen
2013-02-13 8:11 ` Glenn Morris
0 siblings, 2 replies; 7+ messages in thread
From: Kirill A. Korinskiy @ 2011-07-04 7:53 UTC (permalink / raw
To: Chong Yidong; +Cc: Juanma Barranquero, Lars Magne Ingebrigtsen, 5338
[-- Attachment #1: Type: text/plain, Size: 293 bytes --]
On Mon, Jul 4, 2011 at 06:40, Chong Yidong <cyd@stupidchicken.com> wrote:
> Lars Magne Ingebrigtsen <larsi@gnus.org> writes:
>
> > Do we have copyright assignment papers from Kirill A. Korinskiy on file?
>
> No.
>
Sorry, but what do you mean by copyright assignment papers?
--
wbr, Kirill
[-- Attachment #2: Type: text/html, Size: 617 bytes --]
^ permalink raw reply [flat|nested] 7+ messages in thread
* bug#5338: [PATCH] Make a new fortune dat file in compile time if dat file not exist
2011-07-04 7:53 ` Kirill A. Korinskiy
@ 2011-07-04 9:38 ` Lars Magne Ingebrigtsen
2013-02-13 8:11 ` Glenn Morris
1 sibling, 0 replies; 7+ messages in thread
From: Lars Magne Ingebrigtsen @ 2011-07-04 9:38 UTC (permalink / raw
To: Kirill A. Korinskiy; +Cc: Juanma Barranquero, Chong Yidong, 5338
"Kirill A. Korinskiy" <catap@catap.ru> writes:
> Sorry, but what do you mean by copyright assignment papers?
The Free Software Foundation needs to have the copyright of all the code
in Emacs assigned to them. Would you be willing to sign such papers?
--
(domestic pets only, the antidote for overdose, milk.)
bloggy blog http://lars.ingebrigtsen.no/
^ permalink raw reply [flat|nested] 7+ messages in thread
* bug#5338: [PATCH] Make a new fortune dat file in compile time if dat file not exist
2011-07-04 7:53 ` Kirill A. Korinskiy
2011-07-04 9:38 ` Lars Magne Ingebrigtsen
@ 2013-02-13 8:11 ` Glenn Morris
1 sibling, 0 replies; 7+ messages in thread
From: Glenn Morris @ 2013-02-13 8:11 UTC (permalink / raw
To: 5338-done
Version: 24.4
Sorry for the delay. At last applied.
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2013-02-13 8:11 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-01-08 2:20 [PATCH] Make a new fortune dat file in compile time if dat file not exist Kirill A. Korinskiy
2010-01-08 10:12 ` bug#5338: " Juanma Barranquero
2011-07-03 19:33 ` Lars Magne Ingebrigtsen
2011-07-04 2:40 ` Chong Yidong
2011-07-04 7:53 ` Kirill A. Korinskiy
2011-07-04 9:38 ` Lars Magne Ingebrigtsen
2013-02-13 8:11 ` Glenn Morris
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.