From f2483ec4bbe196ab29ef6312b0d7c1c179a9eafe Mon Sep 17 00:00:00 2001
From: Achim Gratz <Stromeko@Stromeko.DE>
Date: Wed, 27 Nov 2013 19:56:38 +0100
Subject: [PATCH] org: fix commit 0911edfac8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* lisp/org.el (org-mode-restart): After `normal-mode´ the mode may not
  be "org-mode".  Explicitly switch to org-mode in that case.
---
 lisp/org.el | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lisp/org.el b/lisp/org.el
index 92344db2b..2501a2342 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -20468,6 +20468,9 @@ Also updates the keyword regular expressions."
   (interactive)
   ;; this will set the mode *and* set file local variables.
   (normal-mode)
+  ;; but it may leave us in some other mode
+  (unless (string= "org-mode" mode-name)
+    (org-mode))
   (message "Org-mode restarted"))
 
 (defun org-kill-note-or-show-branches ()