org: fix commit 0911edfac8

* 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

@@ -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 ()