From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Juanma Barranquero Newsgroups: gmane.emacs.bugs Subject: bug#5338: [PATCH] Make a new fortune dat file in compile time if dat file not exist Date: Fri, 8 Jan 2010 11:12:25 +0100 Message-ID: References: <1262917259-3368-1-git-send-email-catap@catap.ru> Reply-To: Juanma Barranquero , 5338@debbugs.gnu.org NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-Trace: ger.gmane.org 1262945958 1301 80.91.229.12 (8 Jan 2010 10:19:18 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 8 Jan 2010 10:19:18 +0000 (UTC) To: bug-gnu-emacs@gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Fri Jan 08 11:19:11 2010 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.50) id 1NTBvu-0007MX-NS for geb-bug-gnu-emacs@m.gmane.org; Fri, 08 Jan 2010 11:19:07 +0100 Original-Received: from localhost ([127.0.0.1]:34926 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NTBvv-0001vn-3r for geb-bug-gnu-emacs@m.gmane.org; Fri, 08 Jan 2010 05:19:07 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NTBvn-0001sQ-PJ for bug-gnu-emacs@gnu.org; Fri, 08 Jan 2010 05:18:59 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NTBvk-0001ms-3J for bug-gnu-emacs@gnu.org; Fri, 08 Jan 2010 05:18:59 -0500 Original-Received: from [199.232.76.173] (port=39558 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NTBvj-0001mV-LC for bug-gnu-emacs@gnu.org; Fri, 08 Jan 2010 05:18:55 -0500 Original-Received: from debbugs.gnu.org ([140.186.70.43]:37887) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1NTBvj-0008Gs-B4 for bug-gnu-emacs@gnu.org; Fri, 08 Jan 2010 05:18:55 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.69) (envelope-from ) id 1NTBq3-0000v3-0H; Fri, 08 Jan 2010 05:13:03 -0500 X-Loop: bug-gnu-emacs@gnu.org Mail-Followup-To: Juanma Barranquero , 5338@debbugs.gnu.org Resent-From: Juanma Barranquero Original-Sender: debbugs-submit-bounces@debbugs.gnu.org Resent-To: owner@debbugs.gnu.org Resent-CC: catap@catap.ru, bug-gnu-emacs@gnu.org Resent-Date: Fri, 08 Jan 2010 10:13:02 +0000 Resent-Message-ID: Resent-Sender: bug-gnu-emacs@gnu.org X-Emacs-PR-Message: report 5338 X-Emacs-PR-Package: emacs X-Emacs-PR-Keywords: patch Original-Received: via spool by submit@debbugs.gnu.org id=B.12629455813524 (code B ref -1); Fri, 08 Jan 2010 10:13:02 +0000 Original-Received: (at submit) by debbugs.gnu.org; 8 Jan 2010 10:13:01 +0000 Original-Received: from localhost ([127.0.0.1] helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1NTBq1-0000un-CP for submit@debbugs.gnu.org; Fri, 08 Jan 2010 05:13:01 -0500 Original-Received: from fencepost.gnu.org ([140.186.70.10]) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1NTBq0-0000uh-2G for submit@debbugs.gnu.org; Fri, 08 Jan 2010 05:13:00 -0500 Original-Received: from mx10.gnu.org ([199.232.76.166]:33558) by fencepost.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1NTBpx-0007eA-6K for submit@debbugs.gnu.org; Fri, 08 Jan 2010 05:12:57 -0500 Original-Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim 4.60) (envelope-from ) id 1NTBpv-0006IQ-MJ for submit@debbugs.gnu.org; Fri, 08 Jan 2010 05:12:56 -0500 Original-Received: from lists.gnu.org ([199.232.76.165]:37186) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1NTBpv-0006IG-An for submit@debbugs.gnu.org; Fri, 08 Jan 2010 05:12:55 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NTBpu-00051p-Oi for bug-gnu-emacs@gnu.org; Fri, 08 Jan 2010 05:12:54 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NTBpo-0004wY-HD for bug-gnu-emacs@gnu.org; Fri, 08 Jan 2010 05:12:53 -0500 Original-Received: from [199.232.76.173] (port=36141 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NTBpo-0004wG-Cm for bug-gnu-emacs@gnu.org; Fri, 08 Jan 2010 05:12:48 -0500 Original-Received: from mail-bw0-f215.google.com ([209.85.218.215]:34570) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NTBpn-0006FS-MP for bug-gnu-emacs@gnu.org; Fri, 08 Jan 2010 05:12:47 -0500 Original-Received: by bwz7 with SMTP id 7so13231023bwz.26 for ; Fri, 08 Jan 2010 02:12:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:received:in-reply-to:references :from:date:message-id:subject:to:content-type :content-transfer-encoding; bh=WxI04210fi2RCL/kg5IAs0LSmoJgqEXrrD9JjY+3uBg=; b=b7fyrBm/a72B7cKf97R9vVKQUIozQllG9BS06xn01YFXU7T2o6D8zf8PDGgnk1cpa/ RD3oKTepVOuJWRRAkm+ebgotxUJi0IdXANWEAg1LX7Y9A+pM+xxL9bNKmwWEymUbHsiS VwgsUWtNg3qbXhiKppJbalCPmUl3AC6zD1q3M= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :content-type:content-transfer-encoding; b=GXo5IbwCmwf0D/kGV39Pus12mNDa2Y7jHSho+g3+q33mIzDm1Io2eaXNE9mawEjD4K SxZb08EH81LkHIujMyzYLzLT5OY4qYdDmyEn426Br+tlotA+k1SqXH03E82vQ3DnXwxj +txpdKG+gCLiJZuK6/dPtO9pl36s2RyfF3tek= Original-Received: by 10.204.15.24 with SMTP id i24mr1059918bka.2.1262945565126; Fri, 08 Jan 2010 02:12:45 -0800 (PST) In-Reply-To: <1262917259-3368-1-git-send-email-catap@catap.ru> X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 2) X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) X-Spam-Score: -4.3 (----) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.11 Precedence: list X-Spam-Score: -4.3 (----) Resent-Date: Fri, 08 Jan 2010 05:13:03 -0500 X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 3) X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:34072 Archived-At: Package: emacs Severity: minor tags: patch X-Debbugs-CC: Kirill A. Korinskiy ---------- Forwarded message ---------- From: Kirill A. Korinskiy 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" --- =C2=A0lisp/play/fortune.el | =C2=A0 24 +++++++++++++++--------- =C2=A01 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'. =C2=A0This currently cannot handle directories." =C2=A0 (let* ((fortune-file (expand-file-name (substitute-in-file-name file= ))) =C2=A0 =C2=A0 =C2=A0 =C2=A0 (fortune-dat (expand-file-name =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 (substitute-in-file-name - =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 (concat fortune-file fortune-database-extension))))) - =C2=A0(cond ((file-exists-p fortune-file) - =C2=A0 =C2=A0 =C2=A0 =C2=A0(if (file-exists-p fortune-dat) - =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0(cond ((file-newer-than-file-p f= ortune-file fortune-dat) - =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 (message "= Compiling new fortune database %s" fortune-dat) - =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 (shell-com= mand - =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0(con= cat fortune-strfile fortune-strfile-options - =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0" " fortune-file fortune-quiet-strfile-options)))))) - =C2=A0 =C2=A0 =C2=A0 (t (error "Can't compile fortune file %s" fortune-fi= le))))) + =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 (concat fortune-file fortune-database-extension)))) + =C2=A0 =C2=A0 =C2=A0 =C2=A0(fortune-file-exist (file-exists-p fortune-fil= e)) + =C2=A0 =C2=A0 =C2=A0 =C2=A0(fortune-dat-exist (file-exists-p fortune-dat)= ) + =C2=A0 =C2=A0 =C2=A0 =C2=A0(fortune-file-newer (file-newer-than-file-p + =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 fortune-file fortune-dat))) + =C2=A0 =C2=A0(cond + =C2=A0 =C2=A0 (fortune-file-exist + =C2=A0 =C2=A0 =C2=A0(if (or (not fortune-dat-exist) + =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 (and fortune-dat-exist + =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0fortune-fil= e-newer)) + =C2=A0 =C2=A0 =C2=A0 =C2=A0 (message "Compiling new fortune database %s" = fortune-dat) + =C2=A0 =C2=A0 =C2=A0 (shell-command + =C2=A0 =C2=A0 =C2=A0 =C2=A0(concat fortune-strfile fortune-strfile-option= s + =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0" " fortune-file f= ortune-quiet-strfile-options)))) + =C2=A0 =C2=A0 (t (error "Can't compile fortune file %s" fortune-file))))) =C2=A0;;; ************** -- 1.6.2