org.el: (org-end-of-meta-data-and-drawers): simplify.

lisp/org.el

@@ -20028,19 +20028,10 @@ clocking lines, and drawers."
   (org-back-to-heading t)
   (let ((end (save-excursion (outline-next-heading) (point)))
 	(re (concat "[ \t]*$"
-		    "\\|"
-		    "\\(" org-drawer-regexp "\\)" ; group 1 are drawers
-		    "\\|"
-		    "\\([ \t]*\\(" org-keyword-time-regexp "\\)\\)")))
-    (forward-line 1)
-    (while (looking-at (concat "[ \t]*\\(" org-keyword-time-regexp "\\)"))
-      (if (not (match-end 1))
-	  ;; empty or planning line
-	  (forward-line 1)
-	;; a drawer, find the end
-	(re-search-forward "^[ \t]*:END:" end 'move)
-	(forward-line 1)))
-    (point)))
+		    "\\|" org-drawer-regexp 
+		    "\\|" "[ \t]*" org-keyword-time-regexp)))
+    (while (re-search-forward re end 'move) 
+      (forward-line 1))))
 
 (defun org-forward-same-level (arg &optional invisible-ok)
   "Move forward to the arg'th subheading at same level as this one.