org.el (org-mode): Use `org-*-element' functions again

* org.el (org-mode): Use `org-*-element' functions for C-M-a
and C-M-e but fix C-M-e.

lisp/org.el

@@ -5378,7 +5378,12 @@ The following commands are available:
   (org-setup-comments-handling)
   ;; Beginning/end of defun
   (org-set-local 'beginning-of-defun-function 'org-backward-element)
-  (org-set-local 'end-of-defun-function 'org-forward-element)
+  (org-set-local 'end-of-defun-function
+		 (lambda ()
+		   (if (not (org-at-heading-p))
+		       (org-forward-element)
+		     (org-forward-element)
+		     (forward-char -1))))
   ;; Next error for sparse trees
   (org-set-local 'next-error-function 'org-occur-next-match)
   ;; Make sure dependence stuff works reliably, even for users who set it