From e655e664bff9fb6e98478682f03e713f990acba5 Mon Sep 17 00:00:00 2001 From: Achim Gratz Date: Wed, 27 Nov 2013 20:52:03 +0100 Subject: [PATCH] org: check for derived-mode-p instead of "org-mode" exactly * lisp/org.el (org-mode-restart): Check for derived-mode-p instead of "org-mode" exactly. This covers a situation normal-mode already instantiates a derived mode (e.g. via file local variables). --- lisp/org.el | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lisp/org.el b/lisp/org.el index 2501a2342..4e8bd9c48 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -20468,8 +20468,8 @@ 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) + ;; but it may leave us in some unrelated mode + (unless (derived-mode-p "org-mode") (org-mode)) (message "Org-mode restarted"))