From 0de96daa957abcbd808cce47168c45965dbd6a96 Mon Sep 17 00:00:00 2001
From: Bastien Guerry <bzg@altern.org>
Date: Mon, 7 Jan 2013 18:18:27 +0100
Subject: [PATCH] org.el (org-entry-get): Speed up by let-binding some
 variables only if needed
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* org.el (org-entry-get): Speed up by let-binding some
variables only if needed.  Also fix a bug: consider an empty
drawer as no drawer.

Thanks to William Léchelle for reporting this.
---
 lisp/org.el | 41 +++++++++++++++++++++--------------------
 1 file changed, 21 insertions(+), 20 deletions(-)

diff --git a/lisp/org.el b/lisp/org.el
index 826e96fe4..39b65429f 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -14485,26 +14485,27 @@ when a \"nil\" value can supersede a non-nil value higher up the hierarchy."
 	  ;; We need a special property.  Use `org-entry-properties' to
 	  ;; retrieve it, but specify the wanted property
 	  (cdr (assoc property (org-entry-properties nil 'special property)))
-	(let* ((range (org-get-property-block))
-	       (props (list (or (assoc property org-file-properties)
-				(assoc property org-global-properties)
-				(assoc property org-global-properties-fixed))))
-	       (ap (lambda (key)
-		     (when (re-search-forward
-			    (org-re-property key) (cdr range) t)
-		       (setq props
-			     (org-update-property-plist
-			      key
-			      (if (match-end 1)
-				  (org-match-string-no-properties 1) "")
-			      props)))))
-	       val)
-	  (when (and range (goto-char (car range)))
-	    (funcall ap property)
-	    (goto-char (car range))
-	    (while (funcall ap (concat property "+")))
-	    (setq val (cdr (assoc property props)))
-	    (when val (if literal-nil val (org-not-nil val)))))))))
+	(let ((range (org-get-property-block)))
+	  (when (and range (not (eq (car range) (cdr range))))
+	    (let* ((props (list (or (assoc property org-file-properties)
+				    (assoc property org-global-properties)
+				    (assoc property org-global-properties-fixed))))
+		   (ap (lambda (key)
+			 (when (re-search-forward
+				(org-re-property key) (cdr range) t)
+			   (setq props
+				 (org-update-property-plist
+				  key
+				  (if (match-end 1)
+				      (org-match-string-no-properties 1) "")
+				  props)))))
+		   val)
+	      (goto-char (car range))
+	      (funcall ap property)
+	      (goto-char (car range))
+	      (while (funcall ap (concat property "+")))
+	      (setq val (cdr (assoc property props)))
+	      (when val (if literal-nil val (org-not-nil val))))))))))
 
 (defun org-property-or-variable-value (var &optional inherit)
   "Check if there is a property fixing the value of VAR.