From 226639b23956ffeef842a4e1f9914e1b3f36f073 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 5 Feb 2015 10:00:46 +0100
Subject: [PATCH] org-agenda: Fix adding diary entries

* lisp/org-agenda.el (org-agenda-insert-diary-make-new-entry): Fix
  adding adding diary entries the same day.

This is a follow-up to a1116aa54ee4befd8fa52e3f92207db200ebfd59.

Reported-by: Gregor Zattler <telegraph@gmx.net>
<http://permalink.gmane.org/gmane.emacs.orgmode/94638>
---
 lisp/org-agenda.el | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el
index 3b67075a6..5d18a00b3 100644
--- a/lisp/org-agenda.el
+++ b/lisp/org-agenda.el
@@ -9506,7 +9506,9 @@ a timestamp can be added there."
   (let ((col (current-column)))
     (insert text)
     (org-end-of-meta-data)
+    ;; Ensure point is left on a blank line, at proper indentation.
     (unless (bolp) (insert "\n"))
+    (unless (org-looking-at-p "^[ \t]*$") (save-excursion (insert "\n")))
     (when org-adapt-indentation (org-indent-to-column col)))
   (let ((org-show-following-heading t)
 	(org-show-siblings t)
-- 
2.11.4.GIT