From f50f37338953b6d9978e3edfa57a4299ac860886 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Wed, 13 Jun 2018 22:15:56 +0200
Subject: [PATCH] Add facility for commit log messages from Org documents

* lisp/org-compat.el (org-add-log-current-headline): New function.
* lisp/org.el (org-mode): Use new function.
---
 lisp/org-compat.el | 8 ++++++++
 lisp/org.el        | 2 ++
 2 files changed, 10 insertions(+)

diff --git a/lisp/org-compat.el b/lisp/org-compat.el
index 702cd7fa7..febfba4a3 100644
--- a/lisp/org-compat.el
+++ b/lisp/org-compat.el
@@ -712,6 +712,14 @@ To get rid of the restriction, use `\\[org-agenda-remove-restriction-lock]'."
      (add-hook 'speedbar-visiting-tag-hook
 	       (lambda () (and (derived-mode-p 'org-mode) (org-show-context 'org-goto))))))
 
+;;;; Add Log
+
+(defun org-add-log-current-headline ()
+  "Return current headline or nil.
+This function ignores inlinetasks.  It is meant to be used as
+`add-log-current-defun-function' value."
+  (org-with-limited-levels (org-get-heading t t t t)))
+
 ;;;; Flyspell
 
 (defun org--flyspell-object-check-p (element)
diff --git a/lisp/org.el b/lisp/org.el
index cee98e59e..a9537c9ad 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -5509,6 +5509,8 @@ The following commands are available:
 		  (forward-char -1))))
   ;; Next error for sparse trees
   (setq-local next-error-function 'org-occur-next-match)
+  ;; Make commit log messages from Org documents easier.
+  (setq-local add-log-current-defun-function #'org-add-log-current-headline)
   ;; Make sure dependence stuff works reliably, even for users who set it
   ;; too late :-(
   (if org-enforce-todo-dependencies