         ((narf--org-in-list-p)
          (org-insert-heading))
         ((org-on-heading-p)
-         (org-insert-heading-after-current))
+         (org-insert-heading-respect-content))
         (t
          (org-insert-heading-after-current)
          (delete-char 1)))

    (skip-chars-backward "^|\n\r")
    (when (org-looking-at-p " ") (forward-char))))

(provide 'defuns-org)
;;; defuns-org.el ends here

          (t (org-insert-heading)))
    (insert "[ ] ")))

;;;###autoload
(defun narf/org-execute-at-point ()
  (interactive)
  (cond ((org-at-item-checkbox-p)
         (org-toggle-checkbox))
        ((org-entry-is-todo-p)
         (org-todo 'done))
        ((org-table-p)
         (org-table-align))
        ((org-babel-lob-get-info)
         (org-babel-lob-execute-maybe))
        ((org-in-src-block-p)
         (org-babel-execute-src-block))
        ((org-inside-LaTeX-fragment-p)
         (org-toggle-latex-fragment))
        (t (org-toggle-inline-images))))

;;;###autoload
(defun narf/org-toggle-inline-images-at-point ()
  (interactive)
  (if (> (length org-inline-image-overlays) 0)
      (org-remove-inline-images)
    (org-display-inline-images nil t (line-beginning-position) (line-end-position))))

;; Formatting shortcuts
;;;###autoload
(defun narf/org-surround (delim)
  (insert delim) (save-excursion (insert delim)))

;;;###autoload (autoload 'narf:org-search-files-or-headers "defuns-org" nil t)
(evil-define-command narf:org-search-files-or-headers (&optional bang)
