From: Bastien Guerry <bzg@gnu.org>
Date: Mon, 13 Oct 2014 16:44:30 +0000 (+0200)
Subject: Fix org/ChangeLog wrt latest Org Sync.
X-Git-Tag: emacs-24.4-rc1~14
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=212ecd45e38c6035ca1a9b0e9095b2a131567f15;p=emacs.git

Fix org/ChangeLog wrt latest Org Sync.
---

diff --git a/lisp/org/ChangeLog b/lisp/org/ChangeLog
index 98adf5da0e4..bb5898f8229 100644
--- a/lisp/org/ChangeLog
+++ b/lisp/org/ChangeLog
@@ -1,3 +1,18 @@
+2014-10-12  Marco Wahl  <marcowahlsoft@gmail.com>
+
+        * org-agenda.el (org-get-entries-from-diary): Use
+	`diary-fancy-display' instead of the obsolete
+	`diary-display-hook'.
+
+2014-10-12  Nicolas Goaziou  <mail@nicolasgoaziou.fr>
+
+        * ox.el (org-export-async-start): Limit first argument to lambda
+	expressions.
+
+        * ox-publish.el (org-publish, org-publish-all)
+	(org-publish-current-file): Replace `ignore', per limit stated
+	above.
+
 2014-10-12  Christopher Schmidt  <ch@ristopher.com>
 
 	* org.el (orgstruct-make-binding): Do not use loop in interpreted